lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Hans Verkuil
2006-03-30 19:57:28 -03:00
committed by Mauro Carvalho Chehab
parent 0020d3ef91
commit c097b04520
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/video/ir-kbd-i2c.c
View File

@@ -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_saa7134[] = { 0x7a, 0x47, -1 };
static const int probe_em28XX[] = { 0x30, 0x47, -1 }; static const int probe_em28XX[] = { 0x30, 0x47, -1 };
const int *probe = NULL; const int *probe = NULL;
@@ -413,7 +412,7 @@ static int ir_probe(struct i2c_adapter *adap)
probe = probe_bttv; probe = probe_bttv;
break; break;
case I2C_HW_B_CX2341X: case I2C_HW_B_CX2341X:
probe = probe_cx2341x; probe = probe_bttv;
break; break;
case I2C_HW_SAA7134: case I2C_HW_SAA7134:
probe = probe_saa7134; probe = probe_saa7134;