summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhermann pitton <hermann-pitton@arcor.de>2009-08-19 22:30:58 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-12 12:19:15 -0300
commita138ebcf826b9cbf6683e1db25905d7cd89e2dd1 (patch)
tree6840780b1967b2ec419cc7f85c1ae184a77a0482
parent821c777080c43710a3ddbf8bcd708093191b1630 (diff)
downloadlinux-a138ebcf826b9cbf6683e1db25905d7cd89e2dd1.tar.gz
linux-a138ebcf826b9cbf6683e1db25905d7cd89e2dd1.tar.xz
V4L/DVB (12492): saa7134-input: don't probe for the Pinnacle remotes anymore
With the recent improvements we don't need to probe anymore, if we know the i2c address of the receiver. The address of the receiver for the remote with the gray buttons is not confirmed anywhere, but it is very unlikely to see it on something else. We want to have that information anyway. BTW, those remaining still probing, please join. Signed-off-by: hermann pitton <hermann-pitton@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/saa7134/saa7134-input.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index dd8a24263221..bd0bfdea5611 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -721,9 +721,11 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
if (pinnacle_remote == 0) {
init_data.get_key = get_key_pinnacle_color;
init_data.ir_codes = ir_codes_pinnacle_color;
+ info.addr = 0x47;
} else {
init_data.get_key = get_key_pinnacle_grey;
init_data.ir_codes = ir_codes_pinnacle_grey;
+ info.addr = 0x47;
}
break;
case SAA7134_BOARD_UPMOST_PURPLE_TV: