From bd38521c2ea43020c22fbff84928a2d64b81b498 Mon Sep 17 00:00:00 2001
From: Thierry Reding <thierry.reding@avionic-design.de>
Date: Thu, 4 Aug 2011 04:14:03 -0300
Subject: [PATCH] --- yaml --- r: 271685 b: refs/heads/master c:
 9dac920708abb2981d02e6922fd797ef388db5ce h: refs/heads/master i:   271683:
 7075fda179d48238730ce9c32f94649e3fca63fa v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/staging/tm6000/tm6000-cards.c | 5 +++++
 trunk/drivers/staging/tm6000/tm6000-i2c.c   | 5 -----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index e404a6a19205..2e7cc10c4b99 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fd02b4456179544d93d7b64c3362d47d6050ec7
+refs/heads/master: 9dac920708abb2981d02e6922fd797ef388db5ce
diff --git a/trunk/drivers/staging/tm6000/tm6000-cards.c b/trunk/drivers/staging/tm6000/tm6000-cards.c
index 7dbc500bc112..bac4309a3868 100644
--- a/trunk/drivers/staging/tm6000/tm6000-cards.c
+++ b/trunk/drivers/staging/tm6000/tm6000-cards.c
@@ -780,6 +780,11 @@ int tm6000_tuner_callback(void *ptr, int component, int command, int arg)
 			rc = tm6000_i2c_reset(dev, 100);
 			break;
 		}
+		break;
+	case XC2028_I2C_FLUSH:
+		tm6000_set_reg(dev, REQ_50_SET_START, 0, 0);
+		tm6000_set_reg(dev, REQ_51_SET_STOP, 0, 0);
+		break;
 	}
 	return rc;
 }
diff --git a/trunk/drivers/staging/tm6000/tm6000-i2c.c b/trunk/drivers/staging/tm6000/tm6000-i2c.c
index 5a651ea5f60a..76a8e3a49fc7 100644
--- a/trunk/drivers/staging/tm6000/tm6000-i2c.c
+++ b/trunk/drivers/staging/tm6000/tm6000-i2c.c
@@ -219,11 +219,6 @@ static int tm6000_i2c_xfer(struct i2c_adapter *i2c_adap,
 					printk(" %02x", msgs[i].buf[byte]);
 			rc = tm6000_i2c_send_regs(dev, addr, msgs[i].buf[0],
 				msgs[i].buf + 1, msgs[i].len - 1);
-
-			if (addr == dev->tuner_addr  << 1) {
-				tm6000_set_reg(dev, REQ_50_SET_START, 0, 0);
-				tm6000_set_reg(dev, REQ_51_SET_STOP, 0, 0);
-			}
 		}
 		if (i2c_debug >= 2)
 			printk("\n");