p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[media] cx231xx: can't proceed if I2C bus register fails 

The driver should not ignore errors while registering the I2C
bus, as this device can't even minimally work without the buses,
as it uses those buses internally to talk with the several IP
blocks inside the chip.

Cc: stable@vger.kernel.org
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Mauro Carvalho Chehab 2016-09-05 05:56:37 -03:00
parent 4001dfb4b5
commit 461af077d3
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/media/usb/cx231xx/cx231xx-core.c
View File

@ -1324,15 +1324,29 @@ int cx231xx_dev_init(struct cx231xx *dev)
dev->i2c_bus[2].i2c_reserve = 0; dev->i2c_bus[2].i2c_reserve = 0;
/* register I2C buses */ /* register I2C buses */
cx231xx_i2c_register(&dev->i2c_bus[0]); errCode = cx231xx_i2c_register(&dev->i2c_bus[0]);
cx231xx_i2c_register(&dev->i2c_bus[1]); if (errCode < 0)
cx231xx_i2c_register(&dev->i2c_bus[2]); return errCode;
errCode = cx231xx_i2c_register(&dev->i2c_bus[1]);
errCode = cx231xx_i2c_mux_create(dev); if (errCode < 0)
return errCode;
errCode = cx231xx_i2c_register(&dev->i2c_bus[2]);
if (errCode < 0)
return errCode;
errCode = cx231xx_i2c_mux_create(dev);
if (errCode < 0) {
dev_err(dev->dev,
"%s: Failed to create I2C mux\n", __func__);
return errCode;
}
errCode = cx231xx_i2c_mux_register(dev, 0);
if (errCode < 0)
return errCode;
errCode = cx231xx_i2c_mux_register(dev, 1);
if (errCode < 0) if (errCode < 0)
return errCode; return errCode;
cx231xx_i2c_mux_register(dev, 0);
cx231xx_i2c_mux_register(dev, 1);
/* scan the real bus segments in the order of physical port numbers */ /* scan the real bus segments in the order of physical port numbers */
cx231xx_do_i2c_scan(dev, I2C_0); cx231xx_do_i2c_scan(dev, I2C_0);