From 35f6dac3f64b3fad7bff5dbe7847545534ed4009 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 27 Jan 2012 16:21:10 -0300 Subject: [PATCH] --- yaml --- r: 294911 b: refs/heads/master c: 6d6604fa6643d15cd46f891b01084ecfd5d0fbec h: refs/heads/master i: 294909: f2b3924cfdf66f121760f09366eee0e2c0c35fa3 294907: 14cacd50abb763a9f71423579b38c2151ee107a8 294903: 66be439b4cc0b47aad68c45eb57f8eabf25064e7 294895: eb9ddaabce7ec292fd9081b622e68c65740428e4 294879: 24bd92b0c952ae1ff1c39fe926efd268f53e2459 294847: 6bc717708044711223d28fd674d5c76d8aff96bc 294783: 696bf246a575264ded7ac17ed10326b785236d47 294655: ea89e9ecf2eb54f4da1fcf3627d6280b50e88ff6 294399: 54cbdc9ad2d57e0f084ff0f743c7bed0082cbd45 293887: 53b5c2fe7b9bb0297dca6201aaead44892fc077e 292863: 44970fd2b3baeece76e8c59e7f007b958ccb32f3 290815: ef80caba204a6a27732748ce85563df94c39529e 286719: 66d4c0fd3b051803633a7e1f7e2fb3b66e0c2fe6 278527: 60182f3596b168f0a8302e7ae396a910783dc901 262143: 10438bb1a705ac6f20e9ec7238d8999978d135f3 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/vivi.c | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 5ed9df4b5749..4d440289194e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a26243b0e3726d2b39dc23dd2c8717c52a286af4 +refs/heads/master: 6d6604fa6643d15cd46f891b01084ecfd5d0fbec diff --git a/trunk/drivers/media/video/vivi.c b/trunk/drivers/media/video/vivi.c index 64a3b5276ccf..5e8b0710105b 100644 --- a/trunk/drivers/media/video/vivi.c +++ b/trunk/drivers/media/video/vivi.c @@ -1001,17 +1001,6 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i) return 0; } -static int vidioc_subscribe_event(struct v4l2_fh *fh, - struct v4l2_event_subscription *sub) -{ - switch (sub->type) { - case V4L2_EVENT_CTRL: - return v4l2_event_subscribe(fh, sub, 0); - default: - return -EINVAL; - } -} - /* --- controls ---------------------------------------------- */ static int vivi_g_volatile_ctrl(struct v4l2_ctrl *ctrl) @@ -1203,7 +1192,7 @@ static const struct v4l2_ioctl_ops vivi_ioctl_ops = { .vidioc_streamon = vidioc_streamon, .vidioc_streamoff = vidioc_streamoff, .vidioc_log_status = v4l2_ctrl_log_status, - .vidioc_subscribe_event = vidioc_subscribe_event, + .vidioc_subscribe_event = v4l2_ctrl_subscribe_event, .vidioc_unsubscribe_event = v4l2_event_unsubscribe, };