1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
index 249af6a1d56d..cb77197d480e 100644
--- a/drivers/media/video/v4l2-dev.c
+++ b/drivers/media/video/v4l2-dev.c
@@ -428,8 +428,12 @@ static int __video_register_device(struct video_device *vdev, int type, int nr,
 
         vdev->vfl_type = type;
         vdev->cdev = NULL;
-        if (vdev->v4l2_dev && vdev->v4l2_dev->dev)
-                vdev->parent = vdev->v4l2_dev->dev;
+        if (vdev->v4l2_dev) {
+                if (vdev->v4l2_dev->dev)
+                        vdev->parent = vdev->v4l2_dev->dev;
+                if (vdev->ctrl_handler == NULL)
+                        vdev->ctrl_handler = vdev->v4l2_dev->ctrl_handler;
+        }
 
         /* Part 2: find a free minor, device node number and device index. */
 #ifdef CONFIG_VIDEO_FIXED_MINOR_RANGES