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;