Commit b37d9c99 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: dw2102: return -EIO instead of -1 for mac address read errors 



The dvb-usb core function only checks if the returned value is
zero, so it doesn't actually matter the error code. Still, returning
-1 as an error condition is something that we don't do upstream. So,
change the logic to return -EIO in case of I2C transfer failures.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 663e7460

drivers/media/usb/dvb-usb/dw2102.c

+3 −3
Original line number Diff line number Diff line
@@ -830,7 +830,7 @@ static int dw210x_read_mac_address(struct dvb_usb_device *d, u8 mac[6]) 
	for (i = 0; i < 256; i++) {

		if (dw210x_op_rw(d->udev, 0xb6, 0xa0 , i, ibuf, 2, DW210X_READ_MSG) < 0) {

			err("read eeprom failed.");

			return -1;

			return -EIO;

		} else {

			eepromline[i%16] = ibuf[0];

			eeprom[i] = ibuf[0];
@@ -869,7 +869,7 @@ static int s6x0_read_mac_address(struct dvb_usb_device *d, u8 mac[6]) 
		ret = s6x0_i2c_transfer(&d->i2c_adap, msg, 2);

		if (ret != 2) {

			err("read eeprom failed.");

			return -1;

			return -EIO;

		} else {

			eepromline[i % 16] = ibuf[0];

			eeprom[i] = ibuf[0];
@@ -946,7 +946,7 @@ static int su3000_read_mac_address(struct dvb_usb_device *d, u8 mac[6]) 
	for (i = 0; i < 6; i++) {

		obuf[1] = 0xf0 + i;

		if (i2c_transfer(&d->i2c_adap, msg, 2) != 2)

			return -1;

			return -EIO;

		else

			mac[i] = ibuf[0];

	}