---

yaml --- r: 294911 b: refs/heads/master c: 6d6604f h: refs/heads/master i: 294909: f2b3924 294907: 14cacd5 294903: 66be439 294895: eb9ddaa 294879: 24bd92b 294847: 6bc7177 294783: 696bf24 294655: ea89e9e 294399: 54cbdc9 293887: 53b5c2f 292863: 44970fd 290815: ef80cab 286719: 66d4c0f 278527: 60182f3 262143: 10438bb v: v3
git-mirror · Feb 14, 2012 · 35f6dac · 35f6dac
1 parent 88af316
commit 35f6dac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git 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
@@ -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,
 };