From 56c69c741d79f5df5ae630e8ac603e3966459b6e Mon Sep 17 00:00:00 2001 From: hermann pitton Date: Wed, 19 Aug 2009 22:30:58 -0300 Subject: [PATCH] --- yaml --- r: 161549 b: refs/heads/master c: a138ebcf826b9cbf6683e1db25905d7cd89e2dd1 h: refs/heads/master i: 161547: d6789a3d2d51415a4ee13308408b8c6301534412 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7134/saa7134-input.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 692883058109..6e1544d81f3e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 821c777080c43710a3ddbf8bcd708093191b1630 +refs/heads/master: a138ebcf826b9cbf6683e1db25905d7cd89e2dd1 diff --git a/trunk/drivers/media/video/saa7134/saa7134-input.c b/trunk/drivers/media/video/saa7134/saa7134-input.c index dd8a24263221..bd0bfdea5611 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-input.c +++ b/trunk/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: