Commit 3190fbee authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

[media] em28xx: Only change I2C bus inside em28xx-i2c

There's currently a bug on em28xx-i2c that makes it write the
wrong values to register 06, that controlls the I2C bus speed
and bus.

Fix it to change only the I2C bus flag.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 9dc033f1
...@@ -284,6 +284,7 @@ static int em28xx_i2c_xfer(struct i2c_adapter *i2c_adap, ...@@ -284,6 +284,7 @@ static int em28xx_i2c_xfer(struct i2c_adapter *i2c_adap,
struct em28xx *dev = i2c_bus->dev; struct em28xx *dev = i2c_bus->dev;
unsigned bus = i2c_bus->bus; unsigned bus = i2c_bus->bus;
int addr, rc, i, byte; int addr, rc, i, byte;
u8 reg;
rc = rt_mutex_trylock(&dev->i2c_bus_lock); rc = rt_mutex_trylock(&dev->i2c_bus_lock);
if (rc < 0) if (rc < 0)
...@@ -292,10 +293,11 @@ static int em28xx_i2c_xfer(struct i2c_adapter *i2c_adap, ...@@ -292,10 +293,11 @@ static int em28xx_i2c_xfer(struct i2c_adapter *i2c_adap,
/* Switch I2C bus if needed */ /* Switch I2C bus if needed */
if (bus != dev->cur_i2c_bus) { if (bus != dev->cur_i2c_bus) {
if (bus == 1) if (bus == 1)
dev->cur_i2c_bus |= EM2874_I2C_SECONDARY_BUS_SELECT; reg = EM2874_I2C_SECONDARY_BUS_SELECT;
else else
dev->cur_i2c_bus &= ~EM2874_I2C_SECONDARY_BUS_SELECT; reg = 0;
em28xx_write_reg(dev, EM28XX_R06_I2C_CLK, dev->cur_i2c_bus); em28xx_write_reg_bits(dev, EM28XX_R06_I2C_CLK, reg,
EM2874_I2C_SECONDARY_BUS_SELECT);
dev->cur_i2c_bus = bus; dev->cur_i2c_bus = bus;
} }
......
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