Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Mauro Carvalho Chehab <mchehab@kernel.org>

+3 -3
+3 -3
drivers/media/usb/dvb-usb/dw2102.c
··· 830 830 for (i = 0; i < 256; i++) { 831 831 if (dw210x_op_rw(d->udev, 0xb6, 0xa0 , i, ibuf, 2, DW210X_READ_MSG) < 0) { 832 832 err("read eeprom failed."); 833 - return -1; 833 + return -EIO; 834 834 } else { 835 835 eepromline[i%16] = ibuf[0]; 836 836 eeprom[i] = ibuf[0]; ··· 869 869 ret = s6x0_i2c_transfer(&d->i2c_adap, msg, 2); 870 870 if (ret != 2) { 871 871 err("read eeprom failed."); 872 - return -1; 872 + return -EIO; 873 873 } else { 874 874 eepromline[i % 16] = ibuf[0]; 875 875 eeprom[i] = ibuf[0]; ··· 946 946 for (i = 0; i < 6; i++) { 947 947 obuf[1] = 0xf0 + i; 948 948 if (i2c_transfer(&d->i2c_adap, msg, 2) != 2) 949 - return -1; 949 + return -EIO; 950 950 else 951 951 mac[i] = ibuf[0]; 952 952 }