aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2009-10-02 07:47:22 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-12-05 15:41:02 -0500
commitaef02aa1e2593b39f808b2b8ae928699087b96dc (patch)
treee92d1745616924b65e6e209060625e75e0181318 /drivers/media/video/saa7134
parent43e16ea241cab1f4d4206307b2f6eacbaf4dc335 (diff)
V4L/DVB (13234): IR device at I2C address 0x7a
The i2c core prevents us from probing I2C address 0x7a because it's not a valid 7-bit address (reserved for 10-bit addressing.) So we must stop probing this address, and explicitly list all adapters which use it. Under the assumption that only the Upmost Purple TV adapter uses this invalid address, this fix should do the trick. Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: hermann pitton <hermann-pitton@arcor.de> Acked-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7134')
-rw-r--r--drivers/media/video/saa7134/saa7134-input.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index bcb65e93edca..c3b5cfa13b60 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -697,7 +697,7 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
697{ 697{
698 struct i2c_board_info info; 698 struct i2c_board_info info;
699 const unsigned short addr_list[] = { 699 const unsigned short addr_list[] = {
700 0x7a, 0x47, 0x71, 0x2d, 700 0x47, 0x71, 0x2d,
701 I2C_CLIENT_END 701 I2C_CLIENT_END
702 }; 702 };
703 703
@@ -737,6 +737,7 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
737 dev->init_data.name = "Purple TV"; 737 dev->init_data.name = "Purple TV";
738 dev->init_data.get_key = get_key_purpletv; 738 dev->init_data.get_key = get_key_purpletv;
739 dev->init_data.ir_codes = &ir_codes_purpletv_table; 739 dev->init_data.ir_codes = &ir_codes_purpletv_table;
740 info.addr = 0x7a;
740 break; 741 break;
741 case SAA7134_BOARD_MSI_TVATANYWHERE_PLUS: 742 case SAA7134_BOARD_MSI_TVATANYWHERE_PLUS:
742 dev->init_data.name = "MSI TV@nywhere Plus"; 743 dev->init_data.name = "MSI TV@nywhere Plus";