diff --git a/[refs] b/[refs]
index 015948e9eb5b..578c9be0b8d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b82e0cfc15ec7e635eea83b04e1544ab64f81ad
+refs/heads/master: 351d18786e1fa45d1cd20bad03e445dbb50e0912
diff --git a/trunk/drivers/media/tuners/tda18271-fe.c b/trunk/drivers/media/tuners/tda18271-fe.c
index ca202da9d4c9..72c26fd77922 100644
--- a/trunk/drivers/media/tuners/tda18271-fe.c
+++ b/trunk/drivers/media/tuners/tda18271-fe.c
@@ -1159,11 +1159,19 @@ static int tda18271_get_id(struct dvb_frontend *fe)
 	struct tda18271_priv *priv = fe->tuner_priv;
 	unsigned char *regs = priv->tda18271_regs;
 	char *name;
+	int ret;
 
 	mutex_lock(&priv->lock);
-	tda18271_read_regs(fe);
+	ret = tda18271_read_regs(fe);
 	mutex_unlock(&priv->lock);
 
+	if (ret) {
+		tda_info("Error reading device ID @ %d-%04x, bailing out.\n",
+			 i2c_adapter_id(priv->i2c_props.adap),
+			 priv->i2c_props.addr);
+		return -EIO;
+	}
+
 	switch (regs[R_ID] & 0x7f) {
 	case 3:
 		name = "TDA18271HD/C1";