diff options
| author | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-27 16:27:30 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-27 17:03:51 -0300 |
| commit | 1f97947c15a8d2bc21917463eb72d7f8685e3a86 (patch) | |
| tree | cc073f9449de9b9b5a362c27f836310278f6a1fd /drivers/media | |
| parent | 140a7987dbe4c5bbb6bb623373216ee6122fe8bf (diff) | |
| download | linux-next-1f97947c15a8d2bc21917463eb72d7f8685e3a86.tar.gz | |
[media] cx231xx: handle errors at read_eeprom()
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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-cards.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c index 5812c63e1e4b..8039b769f258 100644 --- a/drivers/media/usb/cx231xx/cx231xx-cards.c +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c @@ -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; } |