From b359813d131ae253a86709a03248659e80552a60 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 21 Mar 2013 06:03:27 -0300 Subject: [PATCH] --- yaml --- r: 366711 b: refs/heads/master c: 3190fbee0176a40a8dd13200862d39f956692f63 h: refs/heads/master i: 366709: 145b5cca85a55dcd8cd22df3efabab5099b2dec7 366707: a17f839b653d8feac5234ba03cc40b7218c4abbc 366703: 6d8b53e3ca21adce1c5ed0aa502729e0ca5e8ac8 v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/em28xx/em28xx-i2c.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 61bcf627ed0b..3ae832d015a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9dc033f1eaea01ed6701b16622744c4d57f108b7 +refs/heads/master: 3190fbee0176a40a8dd13200862d39f956692f63 diff --git a/trunk/drivers/media/usb/em28xx/em28xx-i2c.c b/trunk/drivers/media/usb/em28xx/em28xx-i2c.c index de9b2086ab2d..9e2fa41044b3 100644 --- a/trunk/drivers/media/usb/em28xx/em28xx-i2c.c +++ b/trunk/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; }