---

yaml --- r: 366711 b: refs/heads/master c: 3190fbe h: refs/heads/master i: 366709: 145b5cc 366707: a17f839 366703: 6d8b53e v: v3
git-mirror · Mar 22, 2013 · b359813 · b359813
1 parent 057a714
commit b359813
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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;
 	}