2 files changed, 8 insertions, 7 deletions

diff --git a/drivers/media/video/v4l2-device.c b/drivers/media/video/v4l2-device.c
index 4aae501f02d0..c72856c41434 100644
--- a/drivers/media/video/v4l2-device.c
+++ b/drivers/media/video/v4l2-device.c
@@ -209,6 +209,7 @@ int v4l2_device_register_subdev_nodes(struct v4l2_device *v4l2_dev)
                 vdev->v4l2_dev = v4l2_dev;
                 vdev->fops = &v4l2_subdev_fops;
                 vdev->release = video_device_release_empty;
+                vdev->ctrl_handler = sd->ctrl_handler;
                 err = __video_register_device(vdev, VFL_TYPE_SUBDEV, -1, 1,
                                               sd->owner);
                 if (err < 0)
diff --git a/drivers/media/video/v4l2-subdev.c b/drivers/media/video/v4l2-subdev.c
index 812729ebf09e..f396cc3f32af 100644
--- a/drivers/media/video/v4l2-subdev.c
+++ b/drivers/media/video/v4l2-subdev.c
@@ -155,25 +155,25 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
 
         switch (cmd) {
         case VIDIOC_QUERYCTRL:
-                return v4l2_queryctrl(sd->ctrl_handler, arg);
+                return v4l2_queryctrl(vfh->ctrl_handler, arg);
 
         case VIDIOC_QUERYMENU:
-                return v4l2_querymenu(sd->ctrl_handler, arg);
+                return v4l2_querymenu(vfh->ctrl_handler, arg);
 
         case VIDIOC_G_CTRL:
-                return v4l2_g_ctrl(sd->ctrl_handler, arg);
+                return v4l2_g_ctrl(vfh->ctrl_handler, arg);
 
         case VIDIOC_S_CTRL:
-                return v4l2_s_ctrl(sd->ctrl_handler, arg);
+                return v4l2_s_ctrl(vfh->ctrl_handler, arg);
 
         case VIDIOC_G_EXT_CTRLS:
-                return v4l2_g_ext_ctrls(sd->ctrl_handler, arg);
+                return v4l2_g_ext_ctrls(vfh->ctrl_handler, arg);
 
         case VIDIOC_S_EXT_CTRLS:
-                return v4l2_s_ext_ctrls(sd->ctrl_handler, arg);
+                return v4l2_s_ext_ctrls(vfh->ctrl_handler, arg);
 
         case VIDIOC_TRY_EXT_CTRLS:
-                return v4l2_try_ext_ctrls(sd->ctrl_handler, arg);
+                return v4l2_try_ext_ctrls(vfh->ctrl_handler, arg);
 
         case VIDIOC_DQEVENT:
                 if (!(sd->flags & V4L2_SUBDEV_FL_HAS_EVENTS))