aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2012-02-20 00:26:06 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-05-07 15:53:23 -0400
commit0927ee67dd59f715f2a6c796a86a0eda9ea2e7b2 (patch)
treeab45ba3b55c84264c8c1619f7cc79286e70b90b9 /drivers
parent7378c184218227c5b936e3d50c6f03c9e127af00 (diff)
[media] pvrusb2: Implement querystd for videodev_ioctl2
Signed-off-by: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-v4l2.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 83bc4675ec2a..3669090f330e 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -205,6 +205,14 @@ int pvr2_s_std(struct file *file, void *priv, v4l2_std_id *std)
205 pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_STDCUR), *std); 205 pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_STDCUR), *std);
206} 206}
207 207
208static int pvr2_querystd(struct file *file, void *priv, v4l2_std_id *std)
209{
210 struct pvr2_v4l2_fh *fh = file->private_data;
211 struct pvr2_hdw *hdw = fh->channel.mc_head->hdw;
212
213 return pvr2_hdw_get_detected_std(hdw, std);
214}
215
208static int pvr2_enum_input(struct file *file, void *priv, struct v4l2_input *vi) 216static int pvr2_enum_input(struct file *file, void *priv, struct v4l2_input *vi)
209{ 217{
210 struct pvr2_v4l2_fh *fh = file->private_data; 218 struct pvr2_v4l2_fh *fh = file->private_data;
@@ -844,6 +852,7 @@ static const struct v4l2_ioctl_ops pvr2_ioctl_ops = {
844 .vidioc_g_tuner = pvr2_g_tuner, 852 .vidioc_g_tuner = pvr2_g_tuner,
845 .vidioc_g_std = pvr2_g_std, 853 .vidioc_g_std = pvr2_g_std,
846 .vidioc_s_std = pvr2_s_std, 854 .vidioc_s_std = pvr2_s_std,
855 .vidioc_querystd = pvr2_querystd,
847 .vidioc_log_status = pvr2_log_status, 856 .vidioc_log_status = pvr2_log_status,
848 .vidioc_enum_fmt_vid_cap = pvr2_enum_fmt_vid_cap, 857 .vidioc_enum_fmt_vid_cap = pvr2_enum_fmt_vid_cap,
849 .vidioc_g_fmt_vid_cap = pvr2_g_fmt_vid_cap, 858 .vidioc_g_fmt_vid_cap = pvr2_g_fmt_vid_cap,