From 0922ef718154be9bfbeaea9fdcdb5f096e42282c Mon Sep 17 00:00:00 2001 From: Mike Isely Date: Mon, 20 Feb 2012 02:33:06 -0300 Subject: [PATCH] --- yaml --- r: 306240 b: refs/heads/master c: d8329f8e17af85c568768fb268e0695dd1fc8148 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7ad583c4de13..0f58f096daf7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99ba1514ae3aded098138d08c6165caf71bb3017 +refs/heads/master: d8329f8e17af85c568768fb268e0695dd1fc8148 diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index ed497bbf539b..4c1a47470d39 100644 --- a/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c @@ -1348,10 +1348,13 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip, memcpy(&dip->devbase,&vdev_template,sizeof(vdev_template)); dip->devbase.release = pvr2_video_device_release; dip->devbase.ioctl_ops = &pvr2_ioctl_ops; - /* FIXME: tvnorms should be set to the set of supported standards - by this device. Then video_ioctl2 will implement VIDIOC_ENUMSTD - based on this field. */ - dip->devbase.tvnorms = V4L2_STD_ALL; + { + int val; + pvr2_ctrl_get_value( + pvr2_hdw_get_ctrl_by_id(vp->channel.mc_head->hdw, + PVR2_CID_STDAVAIL), &val); + dip->devbase.tvnorms = (v4l2_std_id)val; + } mindevnum = -1; unit_number = pvr2_hdw_get_unit_number(vp->channel.mc_head->hdw);