OSDN Git Service

[media] cx231xx: handle errors at read_eeprom()
authorMauro Carvalho Chehab <m.chehab@samsung.com>
Sun, 27 Jul 2014 19:27:30 +0000 (16:27 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Sun, 27 Jul 2014 20:03:51 +0000 (17:03 -0300)
Fix the following warnings:
drivers/media/usb/cx231xx/cx231xx-cards.c: In function 'read_eeprom':
drivers/media/usb/cx231xx/cx231xx-cards.c:979:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable]

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/usb/cx231xx/cx231xx-cards.c

index 5812c63..8039b76 100644 (file)
@@ -991,13 +991,20 @@ static int read_eeprom(struct cx231xx *dev, u8 *eedata, int len)
 
        /* start reading at offset 0 */
        ret = i2c_transfer(&dev->i2c_bus[1].i2c_adap, &msg_write, 1);
+       if (ret < 0) {
+               cx231xx_err("Can't read eeprom\n");
+               return ret;
+       }
 
        while (len_todo > 0) {
                msg_read.len = (len_todo > 64) ? 64 : len_todo;
                msg_read.buf = eedata_cur;
 
                ret = i2c_transfer(&dev->i2c_bus[1].i2c_adap, &msg_read, 1);
-
+               if (ret < 0) {
+                       cx231xx_err("Can't read eeprom\n");
+                       return ret;
+               }
                eedata_cur += msg_read.len;
                len_todo -= msg_read.len;
        }