2 files changed, 11 insertions, 1 deletions

diff --git a/drivers/media/platform/omap24xxcam.c b/drivers/media/platform/omap24xxcam.c
index debb44ceb185..d2b440c842b3 100644
--- a/drivers/media/platform/omap24xxcam.c
+++ b/drivers/media/platform/omap24xxcam.c
@@ -1656,7 +1656,7 @@ static int omap24xxcam_device_register(struct v4l2_int_device *s)
         }
         vfd->release = video_device_release;
 
-        vfd->parent = cam->dev;
+        vfd->v4l2_dev = &cam->v4l2_dev;
 
         strlcpy(vfd->name, CAM_NAME, sizeof(vfd->name));
         vfd->fops                = &omap24xxcam_fops;
@@ -1752,6 +1752,11 @@ static int omap24xxcam_probe(struct platform_device *pdev)
 
         cam->dev = &pdev->dev;
 
+        if (v4l2_device_register(&pdev->dev, &cam->v4l2_dev)) {
+                dev_err(&pdev->dev, "v4l2_device_register failed\n");
+                goto err;
+        }
+
         /*
          * Impose a lower limit on the amount of memory allocated for
          * capture. We require at least enough memory to double-buffer
@@ -1849,6 +1854,8 @@ static int omap24xxcam_remove(struct platform_device *pdev)
                 cam->mmio_base_phys = 0;
         }
 
+        v4l2_device_unregister(&cam->v4l2_dev);
+
         kfree(cam);
 
         return 0;
diff --git a/drivers/media/platform/omap24xxcam.h b/drivers/media/platform/omap24xxcam.h
index c4395956a493..7f6f79155537 100644
--- a/drivers/media/platform/omap24xxcam.h
+++ b/drivers/media/platform/omap24xxcam.h
@@ -29,6 +29,7 @@
 
 #include <media/videobuf-dma-sg.h>
 #include <media/v4l2-int-device.h>
+#include <media/v4l2-device.h>
 
 /*
  *
@@ -462,6 +463,8 @@ struct omap24xxcam_device {
          */
         struct mutex mutex;
 
+        struct v4l2_device v4l2_dev;
+
         /*** general driver state information ***/
         atomic_t users;
         /*