aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-i2c.c
diff options
context:
space:
mode:
authorOldřich Jedlička <oldium.pro@seznam.cz>2009-02-12 01:43:11 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:42:49 -0400
commitcb3bf504f7c875070d56e84ce1e28aff8c3b6790 (patch)
treea128df79e322523966aea8eefcc8e7620219aae3 /drivers/media/video/saa7134/saa7134-i2c.c
parent995a65285bde47bbb2a0c3dadc0b8822d47d78f4 (diff)
V4L/DVB (10632): Added support for AVerMedia Cardbus Hybrid remote control
Added support for I2C device at address 0x40 and subaddress 0x0d/0x0b that provides remote control key reading support for AVerMedia Cardbus Hybrid card, possibly for other AVerMedia Cardbus cards. The I2C address 0x40 doesn't like the SAA7134's 0xfd quirk, so it was disabled. [mchehab@redhat.com: CodingStyle fixes] Signed-off-by: Oldřich Jedlička <oldium.pro@seznam.cz> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-i2c.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-i2c.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index 2e15f43d26e..f3e285aa2fb 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -255,7 +255,7 @@ static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap,
255 addr = msgs[i].addr << 1; 255 addr = msgs[i].addr << 1;
256 if (msgs[i].flags & I2C_M_RD) 256 if (msgs[i].flags & I2C_M_RD)
257 addr |= 1; 257 addr |= 1;
258 if (i > 0 && msgs[i].flags & I2C_M_RD) { 258 if (i > 0 && msgs[i].flags & I2C_M_RD && msgs[i].addr != 0x40) {
259 /* workaround for a saa7134 i2c bug 259 /* workaround for a saa7134 i2c bug
260 * needed to talk to the mt352 demux 260 * needed to talk to the mt352 demux
261 * thanks to pinnacle for the hint */ 261 * thanks to pinnacle for the hint */