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>

2 files changed, 6 insertions, 1 deletions

diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 107f6d30d007..67c223cc867f 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -6019,6 +6019,11 @@ int saa7134_board_init1(struct saa7134_dev *dev)
                 msleep(10);
                 break;
         case SAA7134_BOARD_AVERMEDIA_CARDBUS_506:
+                saa7134_set_gpio(dev, 23, 0);
+                msleep(10);
+                saa7134_set_gpio(dev, 23, 1);
+                dev->has_remote = SAA7134_REMOTE_I2C;
+                break;
         case SAA7134_BOARD_AVERMEDIA_M103:
                 saa7134_set_gpio(dev, 23, 0);
                 msleep(10);
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index 2e15f43d26ec..f3e285aa2fb4 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,
                         addr  = msgs[i].addr << 1;
                         if (msgs[i].flags & I2C_M_RD)
                                 addr |= 1;
-                        if (i > 0 && msgs[i].flags & I2C_M_RD) {
+                        if (i > 0 && msgs[i].flags & I2C_M_RD && msgs[i].addr != 0x40) {
                                 /* workaround for a saa7134 i2c bug
                                  * needed to talk to the mt352 demux
                                  * thanks to pinnacle for the hint */