Skip to content

Commit 0120000

Browse files
Jean DelvareMauro Carvalho Chehab
Jean Delvare
authored and
Mauro Carvalho Chehab
committed
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 <[email protected]> Acked-by: hermann pitton <[email protected]> Acked-by: Jarod Wilson <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]> --- yaml --- svn_rev: 174015 current_ref: refs/heads/rpi-3.12.y current_commit: aef02aa head_branch: refs/heads/rpi-3.12.y migrated_from: v3
1 parent c69032a commit 0120000

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/rpi-3.12.y: 43e16ea241cab1f4d4206307b2f6eacbaf4dc335
2+
refs/heads/rpi-3.12.y: aef02aa1e2593b39f808b2b8ae928699087b96dc

trunk/drivers/media/video/saa7134/saa7134-input.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
697697
{
698698
struct i2c_board_info info;
699699
const unsigned short addr_list[] = {
700-
0x7a, 0x47, 0x71, 0x2d,
700+
0x47, 0x71, 0x2d,
701701
I2C_CLIENT_END
702702
};
703703

@@ -737,6 +737,7 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
737737
dev->init_data.name = "Purple TV";
738738
dev->init_data.get_key = get_key_purpletv;
739739
dev->init_data.ir_codes = &ir_codes_purpletv_table;
740+
info.addr = 0x7a;
740741
break;
741742
case SAA7134_BOARD_MSI_TVATANYWHERE_PLUS:
742743
dev->init_data.name = "MSI TV@nywhere Plus";

0 commit comments

Comments
 (0)