From 005842f9eccdab0e9c36f69804aa47aa1c20c6de Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Mon, 20 Feb 2012 02:40:56 -0300
Subject: [PATCH] --- yaml --- r: 306243 b: refs/heads/master c:
 aeebb1b3146a70bf02d0115a2be690d856d12e8c h: refs/heads/master i:   306241:
 502158a86800e7d63e80cf43a7b3a47c8f9cac95   306239:
 1db134bd48c879a6616b48a8a81793bb2005a91a v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 27fdc272f599..2e6386ebdb1d 100644
--- 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
index d882c95c5788..fb828ba1dbbe 100644
--- 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;