1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index ed497bbf539b..4c1a47470d39 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/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);