aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ivtv/ivtv-ioctl.c
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2012-04-08 11:59:47 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-05-07 15:29:35 -0400
commit3e366149b8957f809081e5f0f70d209175127e29 (patch)
tree7ba69744a1bacd7b490d02d02d265e42f4c4e7a9 /drivers/media/video/ivtv/ivtv-ioctl.c
parentc53c2549333b340e2662dc64ec81323476b69a97 (diff)
[media] v4l2-ctrls: Use v4l2_subscribed_event_ops
Signed-off-by: Hans de Goede <hdegoede@redhat.com> [hans.verkuil@cisco.com: Fix a locking bug] Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-ioctl.c')
-rw-r--r--drivers/media/video/ivtv/ivtv-ioctl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index a7730fd4827f..70cd802c9ca8 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -1468,8 +1468,9 @@ static int ivtv_subscribe_event(struct v4l2_fh *fh, struct v4l2_event_subscripti
1468 switch (sub->type) { 1468 switch (sub->type) {
1469 case V4L2_EVENT_VSYNC: 1469 case V4L2_EVENT_VSYNC:
1470 case V4L2_EVENT_EOS: 1470 case V4L2_EVENT_EOS:
1471 case V4L2_EVENT_CTRL:
1472 return v4l2_event_subscribe(fh, sub, 0, NULL); 1471 return v4l2_event_subscribe(fh, sub, 0, NULL);
1472 case V4L2_EVENT_CTRL:
1473 return v4l2_event_subscribe(fh, sub, 0, &v4l2_ctrl_sub_ev_ops);
1473 default: 1474 default:
1474 return -EINVAL; 1475 return -EINVAL;
1475 } 1476 }