diff --git a/[refs] b/[refs]
index f071cd3c2697..6c3b86290dea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f8ca0b541c8bb542edb02dad68bd723625132e7
+refs/heads/master: 004e45d736bfe62159bd4dc1549eff414bd27496
diff --git a/trunk/drivers/media/v4l2-core/tuner-core.c b/trunk/drivers/media/v4l2-core/tuner-core.c
index f1e8b402b7ca..cf9a9af90322 100644
--- a/trunk/drivers/media/v4l2-core/tuner-core.c
+++ b/trunk/drivers/media/v4l2-core/tuner-core.c
@@ -220,18 +220,20 @@ static void fe_standby(struct dvb_frontend *fe)
 
 static int fe_has_signal(struct dvb_frontend *fe)
 {
-	u16 strength = 0;
+	u16 strength;
 
-	fe->ops.tuner_ops.get_rf_strength(fe, &strength);
+	if (fe->ops.tuner_ops.get_rf_strength(fe, &strength) < 0)
+		return 0;
 
 	return strength;
 }
 
 static int fe_get_afc(struct dvb_frontend *fe)
 {
-	s32 afc = 0;
+	s32 afc;
 
-	fe->ops.tuner_ops.get_afc(fe, &afc);
+	if (fe->ops.tuner_ops.get_afc(fe, &afc) < 0)
+		return 0;
 
 	return afc;
 }