summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorThierry Reding <thierry.reding@avionic-design.de>2011-08-04 04:14:03 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-08-31 17:17:06 -0300
commit9dac920708abb2981d02e6922fd797ef388db5ce (patch)
tree074f621b565246c99f3f3cf8e6be76e584d0b3ac /drivers
parent3fd02b4456179544d93d7b64c3362d47d6050ec7 (diff)
downloadlinux-stable-9dac920708abb2981d02e6922fd797ef388db5ce.tar.gz
linux-stable-9dac920708abb2981d02e6922fd797ef388db5ce.tar.bz2
linux-stable-9dac920708abb2981d02e6922fd797ef388db5ce.zip
[media] tm6000: Implement I2C flush callback
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/tm6000/tm6000-cards.c5
-rw-r--r--drivers/staging/tm6000/tm6000-i2c.c5
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/tm6000/tm6000-cards.c b/drivers/staging/tm6000/tm6000-cards.c
index 7dbc500bc112..bac4309a3868 100644
--- a/drivers/staging/tm6000/tm6000-cards.c
+++ b/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/drivers/staging/tm6000/tm6000-i2c.c b/drivers/staging/tm6000/tm6000-i2c.c
index 5a651ea5f60a..76a8e3a49fc7 100644
--- a/drivers/staging/tm6000/tm6000-i2c.c
+++ b/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");