summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2012-02-20 06:26:06 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-05-07 21:53:23 +0200
commit0927ee67dd59f715f2a6c796a86a0eda9ea2e7b2 (patch)
treeab45ba3b55c84264c8c1619f7cc79286e70b90b9 /drivers/media/video/pvrusb2/pvrusb2-v4l2.c
parent[media] pvrusb2: Clean up pvr2_hdw_get_detected_std() (diff)
downloadlinux-0927ee67dd59f715f2a6c796a86a0eda9ea2e7b2.tar.xz
linux-0927ee67dd59f715f2a6c796a86a0eda9ea2e7b2.zip
[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/media/video/pvrusb2/pvrusb2-v4l2.c')
-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)
pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_STDCUR), *std);
}
+static int pvr2_querystd(struct file *file, void *priv, v4l2_std_id *std)
+{
+ struct pvr2_v4l2_fh *fh = file->private_data;
+ struct pvr2_hdw *hdw = fh->channel.mc_head->hdw;
+
+ return pvr2_hdw_get_detected_std(hdw, std);
+}
+
static int pvr2_enum_input(struct file *file, void *priv, struct v4l2_input *vi)
{
struct pvr2_v4l2_fh *fh = file->private_data;
@@ -844,6 +852,7 @@ static const struct v4l2_ioctl_ops pvr2_ioctl_ops = {
.vidioc_g_tuner = pvr2_g_tuner,
.vidioc_g_std = pvr2_g_std,
.vidioc_s_std = pvr2_s_std,
+ .vidioc_querystd = pvr2_querystd,
.vidioc_log_status = pvr2_log_status,
.vidioc_enum_fmt_vid_cap = pvr2_enum_fmt_vid_cap,
.vidioc_g_fmt_vid_cap = pvr2_g_fmt_vid_cap,