---

yaml --- r: 366787 b: refs/heads/master c: 59d7b91 h: refs/heads/master i: 366785: fda9343 366783: d95a183 v: v3
git-mirror · Mar 24, 2013 · e4b7dff · e4b7dff
1 parent d18386b
commit e4b7dff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bae7432060960dd0ffdc4bd67986ac3d1f5733b0
+refs/heads/master: 59d7b91a1d89168d44f07c8f8fb0ad0dc65a140f
diff --git a/trunk/drivers/staging/media/go7007/go7007-v4l2.c b/trunk/drivers/staging/media/go7007/go7007-v4l2.c
@@ -1188,6 +1188,14 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 	return call_all(&go->v4l2_dev, tuner, s_frequency, f);
 }
 
+static int vidioc_log_status(struct file *file, void *priv)
+{
+	struct go7007 *go = ((struct go7007_file *) priv)->go;
+
+	v4l2_ctrl_log_status(file, priv);
+	return call_all(&go->v4l2_dev, core, log_status);
+}
+
 static int vidioc_cropcap(struct file *file, void *priv,
 					struct v4l2_cropcap *cropcap)
 {
@@ -1654,7 +1662,7 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
 	.vidioc_cropcap           = vidioc_cropcap,
 	.vidioc_g_crop            = vidioc_g_crop,
 	.vidioc_s_crop            = vidioc_s_crop,
-	.vidioc_log_status        = v4l2_ctrl_log_status,
+	.vidioc_log_status        = vidioc_log_status,
 	.vidioc_subscribe_event   = v4l2_ctrl_subscribe_event,
 	.vidioc_unsubscribe_event = v4l2_event_unsubscribe,
 };