From f43da2f5f039a34a43391896968f458d8b603597 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Fri, 26 Aug 2011 08:45:38 -0300
Subject: [PATCH] --- yaml --- r: 271847 b: refs/heads/master c:
 380834d674c2b3655a9d7a219f288331f5cc7b4f h: refs/heads/master i:   271845:
 86f21766acb703a05d84d836b8d8aaf3e6b6e6a1   271843:
 63f4091cd9dad7f0dc4afa25e54e1110b11b7ce0   271839:
 6b02ec3f12e1e26d7c93b389813db07bf618ee21 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/media/video/vivi.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ea0c438b17ef..ffc4cce3562b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43d23f36297d030194c5c82a0593eb7eddcb4fbb
+refs/heads/master: 380834d674c2b3655a9d7a219f288331f5cc7b4f
diff --git a/trunk/drivers/media/video/vivi.c b/trunk/drivers/media/video/vivi.c
index 21bb324b701a..7cf94c09d99a 100644
--- a/trunk/drivers/media/video/vivi.c
+++ b/trunk/drivers/media/video/vivi.c
@@ -958,6 +958,14 @@ static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
 	return vb2_streamoff(&dev->vb_vidq, i);
 }
 
+static int vidioc_log_status(struct file *file, void *priv)
+{
+	struct vivi_dev *dev = video_drvdata(file);
+
+	v4l2_ctrl_handler_log_status(&dev->ctrl_handler, dev->v4l2_dev.name);
+	return 0;
+}
+
 static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *i)
 {
 	return 0;
@@ -1201,6 +1209,7 @@ static const struct v4l2_ioctl_ops vivi_ioctl_ops = {
 	.vidioc_s_input       = vidioc_s_input,
 	.vidioc_streamon      = vidioc_streamon,
 	.vidioc_streamoff     = vidioc_streamoff,
+	.vidioc_log_status    = vidioc_log_status,
 	.vidioc_subscribe_event = vidioc_subscribe_event,
 	.vidioc_unsubscribe_event = v4l2_event_unsubscribe,
 };