diff --git a/[refs] b/[refs]
index b63e91e6eaf4..ac6dbc1fc318 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c71d4bc512dda42069c70219bd00315a91550367
+refs/heads/master: a5e9fe149afb0fdf0de4729f1b0d203d4ac14906
diff --git a/trunk/drivers/media/video/tuner-xc2028.c b/trunk/drivers/media/video/tuner-xc2028.c
index 911831442b59..8fa3ab76fd5c 100644
--- a/trunk/drivers/media/video/tuner-xc2028.c
+++ b/trunk/drivers/media/video/tuner-xc2028.c
@@ -912,7 +912,11 @@ static int xc2028_set_tv_freq(struct dvb_frontend *fe,
 	struct xc2028_data *priv = fe->tuner_priv;
 	fe_bandwidth_t bw;
 
-	/* FIXME: Maybe there are more 6 MHz video standards */
+	/* if std is not defined, choose one */
+	if (!p->std)
+		p->std = V4L2_STD_MN;
+
+	/* PAL/M, PAL/N, PAL/Nc and NTSC variants should use 6MHz firmware */
 	if (p->std & V4L2_STD_MN)
 		bw = BANDWIDTH_6_MHZ;
 	else