ENGR00303663 mxc v4l2 capture: Don't return error if we cannot get mipi csi2

[karo-tx-linux.git] / drivers / media / media-device.c

diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index 703560fa5e73b456cbc0951ccb61957bdfecebac..88b97c9e64acb649ee646832daaf63f04101cc16 100644 (file)
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -373,7 +373,8 @@ static void media_device_release(struct media_devnode *mdev)
  * - dev must point to the parent device
  * - model must be filled with the device model name
  */
-int __must_check media_device_register(struct media_device *mdev)
+int __must_check __media_device_register(struct media_device *mdev,
+                                        struct module *owner)
 {
        int ret;
 
@@ -389,7 +390,7 @@ int __must_check media_device_register(struct media_device *mdev)
        mdev->devnode.fops = &media_device_fops;
        mdev->devnode.parent = mdev->dev;
        mdev->devnode.release = media_device_release;
-       ret = media_devnode_register(&mdev->devnode);
+       ret = media_devnode_register(&mdev->devnode, owner);
        if (ret < 0)
                return ret;
 
@@ -401,7 +402,7 @@ int __must_check media_device_register(struct media_device *mdev)
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(media_device_register);
+EXPORT_SYMBOL_GPL(__media_device_register);
 
 /**
  * media_device_unregister - unregister a media device