---

yaml --- r: 306240 b: refs/heads/master c: d8329f8 h: refs/heads/master v: v3
git-mirror · May 7, 2012 · 0922ef7 · 0922ef7
1 parent 1db134b
commit 0922ef7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git 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
@@ -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);