diff --git a/drivers/media/dvb-frontends/tda10071.c b/drivers/media/dvb-frontends/tda10071.c
index 31328540e5c45d21db516d28410f10d4c61619b8..1470a5d63f581f8374d4e39f51a5d27c2dad515c 100644
--- a/drivers/media/dvb-frontends/tda10071.c
+++ b/drivers/media/dvb-frontends/tda10071.c
@@ -1348,18 +1348,30 @@ static int tda10071_probe(struct i2c_client *client,
 
 	/* chip ID */
 	ret = tda10071_rd_reg(dev, 0xff, &u8tmp);
-	if (ret || u8tmp != 0x0f)
+	if (ret)
+		goto err_kfree;
+	if (u8tmp != 0x0f) {
+		ret = -ENODEV;
 		goto err_kfree;
+	}
 
 	/* chip type */
 	ret = tda10071_rd_reg(dev, 0xdd, &u8tmp);
-	if (ret || u8tmp != 0x00)
+	if (ret)
+		goto err_kfree;
+	if (u8tmp != 0x00) {
+		ret = -ENODEV;
 		goto err_kfree;
+	}
 
 	/* chip version */
 	ret = tda10071_rd_reg(dev, 0xfe, &u8tmp);
-	if (ret || u8tmp != 0x01)
+	if (ret)
 		goto err_kfree;
+	if (u8tmp != 0x01) {
+		ret = -ENODEV;
+		goto err_kfree;
+	}
 
 	/* create dvb_frontend */
 	memcpy(&dev->fe.ops, &tda10071_ops, sizeof(struct dvb_frontend_ops));