From 52c0c52e342b59f6d1833095298992823c236512 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Sun, 9 Sep 2007 06:17:44 -0300
Subject: [PATCH] --- yaml --- r: 65887 b: refs/heads/master c:
 39f46adef8e83653b4716369683c134e1413ad30 h: refs/heads/master i:   65885:
 af13f0b4e8713175931fbdbeeff7b4ee1b51e3fa   65883:
 6affb6917c66cca4cdea4c24b50dfa8445536d7a   65879:
 c33273c1c01a12ac69042b415ca04fe6e2d8dd27   65871:
 eea27839f6def5cf1889e1ae2d6a4787a077bfe8   65855:
 cb5f36c937b408622bf1dc019fc1cecbebc1ee48 v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/media/video/usbvision/usbvision-i2c.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e8fa5c5a651d..495dcb054f42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fb0dfc853735ccf4e580b0d71510bad96d37c4f
+refs/heads/master: 39f46adef8e83653b4716369683c134e1413ad30
diff --git a/trunk/drivers/media/video/usbvision/usbvision-i2c.c b/trunk/drivers/media/video/usbvision/usbvision-i2c.c
index 025be555194f..c66aef63916f 100644
--- a/trunk/drivers/media/video/usbvision/usbvision-i2c.c
+++ b/trunk/drivers/media/video/usbvision/usbvision-i2c.c
@@ -134,8 +134,6 @@ static inline int usb_find_address(struct i2c_adapter *i2c_adap,
 		addr = (msg->addr << 1);
 		if (flags & I2C_M_RD)
 			addr |= 1;
-		if (flags & I2C_M_REV_DIR_ADDR)
-			addr ^= 1;
 
 		add[0] = addr;
 		if (flags & I2C_M_RD)
@@ -192,7 +190,7 @@ static int algo_control(struct i2c_adapter *adapter, unsigned int cmd, unsigned
 
 static u32 functionality(struct i2c_adapter *adap)
 {
-	return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR | I2C_FUNC_PROTOCOL_MANGLING;
+	return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR;
 }