diff options
| author | Mauro Carvalho Chehab | 2013-03-21 10:03:27 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2013-03-22 17:19:52 +0100 |
| commit | 3190fbee0176a40a8dd13200862d39f956692f63 (patch) | |
| tree | 1a33ef443bcd0fc33f36b89b85eab9184182c79b | |
| parent | [media] m5602_ov7660: return error at ov7660_init() (diff) | |
| download | kernel-qcow2-linux-3190fbee0176a40a8dd13200862d39f956692f63.tar.gz kernel-qcow2-linux-3190fbee0176a40a8dd13200862d39f956692f63.tar.xz kernel-qcow2-linux-3190fbee0176a40a8dd13200862d39f956692f63.zip | |
[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: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/usb/em28xx/em28xx-i2c.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-i2c.c b/drivers/media/usb/em28xx/em28xx-i2c.c index de9b2086ab2d..9e2fa41044b3 100644 --- a/drivers/media/usb/em28xx/em28xx-i2c.c +++ b/drivers/media/usb/em28xx/em28xx-i2c.c @@ -284,6 +284,7 @@ static int em28xx_i2c_xfer(struct i2c_adapter *i2c_adap, struct em28xx *dev = i2c_bus->dev; unsigned bus = i2c_bus->bus; int addr, rc, i, byte; + u8 reg; rc = rt_mutex_trylock(&dev->i2c_bus_lock); if (rc < 0) @@ -292,10 +293,11 @@ static int em28xx_i2c_xfer(struct i2c_adapter *i2c_adap, /* Switch I2C bus if needed */ if (bus != dev->cur_i2c_bus) { if (bus == 1) - dev->cur_i2c_bus |= EM2874_I2C_SECONDARY_BUS_SELECT; + reg = EM2874_I2C_SECONDARY_BUS_SELECT; else - dev->cur_i2c_bus &= ~EM2874_I2C_SECONDARY_BUS_SELECT; - em28xx_write_reg(dev, EM28XX_R06_I2C_CLK, dev->cur_i2c_bus); + reg = 0; + em28xx_write_reg_bits(dev, EM28XX_R06_I2C_CLK, reg, + EM2874_I2C_SECONDARY_BUS_SELECT); dev->cur_i2c_bus = bus; } |