---

yaml --- r: 306243 b: refs/heads/master c: aeebb1b h: refs/heads/master i: 306241: 502158a 306239: 1db134b v: v3
git-mirror · May 7, 2012 · 005842f · 005842f
1 parent 847e99c
commit 005842f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0bb609fdc0b842799d5108aec7fae13b0fd32cd
+refs/heads/master: aeebb1b3146a70bf02d0115a2be690d856d12e8c
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -2867,7 +2867,7 @@ static void pvr2_subdev_set_control(struct pvr2_hdw *hdw, int id,
 v4l2_std_id pvr2_hdw_get_detected_std(struct pvr2_hdw *hdw)
 {
 	v4l2_std_id std;
-	std = V4L2_STD_ALL;
+	std = (v4l2_std_id)hdw->std_mask_avail;
 	v4l2_device_call_all(&hdw->v4l2_dev, 0,
 			     video, querystd, &std);
 	return std;