[media] tda18271: properly report read errors in tda18271_get_id
authorMichael Krufky <mkrufky@linuxtv.org>
Tue, 2 Oct 2012 14:04:36 +0000 (11:04 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 2 Oct 2012 18:17:46 +0000 (15:17 -0300)
Until now, if there is a read error in tda18271_get_id, the driver
reports "Unknown device..."  Instead, check the return value of
tda18271_read_regs and display the appropriate error message.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/tuners/tda18271-fe.c

index ca202da9d4c9f129362a850adabe1fd1427f8536..72c26fd77922883bf029a2b19d0af2ac52194c8b 100644 (file)
@@ -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";