From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans Verkuil Subject: [PATCH 4/6] vivi: use v4l2_ctrl_subscribe_event. Date: Thu, 2 Feb 2012 12:56:34 +0100 Message-ID: References: <1328183796-3168-1-git-send-email-hverkuil@xs4all.nl> Return-path: In-Reply-To: <1328183796-3168-1-git-send-email-hverkuil@xs4all.nl> In-Reply-To: <71ef01f774221fd98c5d3e5a0dc4613dc928d967.1328183271.git.hans.verkuil@cisco.com> References: <71ef01f774221fd98c5d3e5a0dc4613dc928d967.1328183271.git.hans.verkuil@cisco.com> Sender: linux-media-owner@vger.kernel.org To: linux-media@vger.kernel.org Cc: Jiri Kosina , linux-input@vger.kernel.org, Hans Verkuil List-Id: linux-input@vger.kernel.org From: Hans Verkuil Signed-off-by: Hans Verkuil --- drivers/media/video/vivi.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index cef8c91..28d7112 100644 --- a/drivers/media/video/vivi.c +++ b/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, }; -- 1.7.8.3