Skip to content
This repository has been archived by the owner on Aug 27, 2022. It is now read-only.

Commit

Permalink
[media] v4l2-subdev: implement per-filehandle control handlers
Browse files Browse the repository at this point in the history
To be consistent with v4l2-ioctl.c.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Jul 27, 2011
1 parent 2d28b68 commit 18d171b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions drivers/media/video/v4l2-device.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
14 changes: 7 additions & 7 deletions drivers/media/video/v4l2-subdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit 18d171b

Please sign in to comment.