diff --git a/[refs] b/[refs]
index 67026eb71c3a..e29a71c638ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a87d7c4f259efa89ae6627c49e403eef51a3058
+refs/heads/master: 0b82c5d6748a15758875f78ac772c6d48ebead2a
diff --git a/trunk/drivers/media/common/tuners/tuner-simple.c b/trunk/drivers/media/common/tuners/tuner-simple.c
index fb3f3b3adaba..1a21191566f5 100644
--- a/trunk/drivers/media/common/tuners/tuner-simple.c
+++ b/trunk/drivers/media/common/tuners/tuner-simple.c
@@ -1059,7 +1059,12 @@ struct dvb_frontend *simple_tuner_attach(struct dvb_frontend *fe,
 	memcpy(&fe->ops.tuner_ops, &simple_tuner_ops,
 	       sizeof(struct dvb_tuner_ops));
 
-	tuner_info("type set to %d (%s)\n", type, priv->tun->name);
+	if (type != priv->type)
+		tuner_warn("couldn't set type to %d. Using %d (%s) instead\n",
+			    type, priv->type, priv->tun->name);
+	else
+		tuner_info("type set to %d (%s)\n",
+			   priv->type, priv->tun->name);
 
 	if ((debug) || ((atv_input[priv->nr] > 0) ||
 			(dtv_input[priv->nr] > 0))) {