Commit 7e511d9e authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Greg Kroah-Hartman

cx231xx: can't proceed if I2C bus register fails

commit 461af077 upstream.

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.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5dfa6979
......@@ -1302,15 +1302,29 @@ int cx231xx_dev_init(struct cx231xx *dev)
dev->i2c_bus[2].i2c_reserve = 0;
/* register I2C buses */
cx231xx_i2c_register(&dev->i2c_bus[0]);
cx231xx_i2c_register(&dev->i2c_bus[1]);
cx231xx_i2c_register(&dev->i2c_bus[2]);
errCode = cx231xx_i2c_register(&dev->i2c_bus[0]);
if (errCode < 0)
return errCode;
errCode = cx231xx_i2c_register(&dev->i2c_bus[1]);
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)
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 */
cx231xx_do_i2c_scan(dev, I2C_0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment