From 562a9b08a0fda013c3ad6fb506c58a9f4d9f5518 Mon Sep 17 00:00:00 2001
From: Hans-Frieder Vogt <hfvogt@gmx.net>
Date: Sun, 1 Apr 2012 14:11:29 -0300
Subject: [PATCH] --- yaml --- r: 306100 b: refs/heads/master c:
 812fe6d9426a23ad78055f1fa955acef9bea9a93 h: refs/heads/master v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/media/dvb/dvb-usb/af9035.c | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 68d2aa50d9fd..6308f53b61fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e8a5ac763d057fae50f2f7cc4fc830c5f815d26
+refs/heads/master: 812fe6d9426a23ad78055f1fa955acef9bea9a93
diff --git a/trunk/drivers/media/dvb/dvb-usb/af9035.c b/trunk/drivers/media/dvb/dvb-usb/af9035.c
index dc0a49ac664a..6a83120afcd6 100644
--- a/trunk/drivers/media/dvb/dvb-usb/af9035.c
+++ b/trunk/drivers/media/dvb/dvb-usb/af9035.c
@@ -209,24 +209,15 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap,
 					msg[1].len);
 		} else {
 			/* I2C */
-#if 0
-			/*
-			 * FIXME: Keep that code. It should work but as it is
-			 * not tested I left it disabled and return -EOPNOTSUPP
-			 * for the sure.
-			 */
 			u8 buf[4 + msg[0].len];
 			struct usb_req req = { CMD_I2C_RD, 0, sizeof(buf),
 					buf, msg[1].len, msg[1].buf };
-			buf[0] = msg[0].len;
+			buf[0] = msg[1].len;
 			buf[1] = msg[0].addr << 1;
 			buf[2] = 0x01;
 			buf[3] = 0x00;
 			memcpy(&buf[4], msg[0].buf, msg[0].len);
 			ret = af9035_ctrl_msg(d->udev, &req);
-#endif
-			pr_debug("%s: I2C operation not supported\n", __func__);
-			ret = -EOPNOTSUPP;
 		}
 	} else if (num == 1 && !(msg[0].flags & I2C_M_RD)) {
 		if (msg[0].len > 40) {