V4L/DVB (3696): Previous change for cx2341X boards broke the remote support

Partially revert previous change to fix IR support.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index fe76379..7e66d83 100644 (file)
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -400,7 +400,6 @@ static int ir_probe(struct i2c_adapter *adap)
        */
 
        static const int probe_bttv[] = { 0x1a, 0x18, 0x4b, 0x64, 0x30, -1};
        */
 
        static const int probe_bttv[] = { 0x1a, 0x18, 0x4b, 0x64, 0x30, -1};

-       static const int probe_cx2341x[] = { 0x18, 0x7a, -1};

        static const int probe_saa7134[] = { 0x7a, 0x47, -1 };
        static const int probe_em28XX[] = { 0x30, 0x47, -1 };
        const int *probe = NULL;
        static const int probe_saa7134[] = { 0x7a, 0x47, -1 };
        static const int probe_em28XX[] = { 0x30, 0x47, -1 };
        const int *probe = NULL;


@@ -413,7 +412,7 @@ static int ir_probe(struct i2c_adapter *adap)
                probe = probe_bttv;
                break;
        case I2C_HW_B_CX2341X:
                probe = probe_bttv;
                break;
        case I2C_HW_B_CX2341X:

-               probe = probe_cx2341x;
+               probe = probe_bttv;

                break;
        case I2C_HW_SAA7134:
                probe = probe_saa7134;
                break;
        case I2C_HW_SAA7134:
                probe = probe_saa7134;