aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pwc
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2011-08-26 07:46:13 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-09-21 09:51:20 -0400
commit34ebdc97b9f273262559ab410d18f4e9424a54c2 (patch)
tree942b24fb23e29c4e6109da642cf70af9a6d1e3ef /drivers/media/video/pwc
parent380834d674c2b3655a9d7a219f288331f5cc7b4f (diff)
[media] pwc: add support for VIDIOC_LOG_STATUS
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/pwc')
-rw-r--r--drivers/media/video/pwc/pwc-v4l.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/media/video/pwc/pwc-v4l.c b/drivers/media/video/pwc/pwc-v4l.c
index 0a41ebbb7bcb..a10ff6b64acf 100644
--- a/drivers/media/video/pwc/pwc-v4l.c
+++ b/drivers/media/video/pwc/pwc-v4l.c
@@ -1078,6 +1078,14 @@ static int pwc_enum_frameintervals(struct file *file, void *fh,
1078 return 0; 1078 return 0;
1079} 1079}
1080 1080
1081static int pwc_log_status(struct file *file, void *priv)
1082{
1083 struct pwc_device *pdev = video_drvdata(file);
1084
1085 v4l2_ctrl_handler_log_status(&pdev->ctrl_handler, PWC_NAME);
1086 return 0;
1087}
1088
1081static long pwc_default(struct file *file, void *fh, bool valid_prio, 1089static long pwc_default(struct file *file, void *fh, bool valid_prio,
1082 int cmd, void *arg) 1090 int cmd, void *arg)
1083{ 1091{
@@ -1101,6 +1109,7 @@ const struct v4l2_ioctl_ops pwc_ioctl_ops = {
1101 .vidioc_dqbuf = pwc_dqbuf, 1109 .vidioc_dqbuf = pwc_dqbuf,
1102 .vidioc_streamon = pwc_streamon, 1110 .vidioc_streamon = pwc_streamon,
1103 .vidioc_streamoff = pwc_streamoff, 1111 .vidioc_streamoff = pwc_streamoff,
1112 .vidioc_log_status = pwc_log_status,
1104 .vidioc_enum_framesizes = pwc_enum_framesizes, 1113 .vidioc_enum_framesizes = pwc_enum_framesizes,
1105 .vidioc_enum_frameintervals = pwc_enum_frameintervals, 1114 .vidioc_enum_frameintervals = pwc_enum_frameintervals,
1106 .vidioc_default = pwc_default, 1115 .vidioc_default = pwc_default,