diff options
author | Jean Delvare <khali@linux-fr.org> | 2010-03-14 21:57:56 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-17 23:47:12 -0400 |
commit | c6ebc6c4acbedcc766a8af147ccb9c39e77578ae (patch) | |
tree | 70779696c9886ab4cea27ac7914e25888b6cd17a /drivers/media/video/saa7134 | |
parent | 2415a2c14ef5fde98d61e3af4c5ff6e019659799 (diff) |
V4L/DVB: saa7134: Fix IR support of some ASUS TV-FM 7135 variants
Some variants of the ASUS TV-FM 7135 are handled as the ASUSTeK P7131
Analog (card=146). However, by the time we find out, some
card-specific initialization is missed. In particular, the fact that
the IR is GPIO-based. Set it when we change the card type, and run
saa7134_input_init1().
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7134')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index 297833fb3b4a..aa07cb11e104 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -7215,6 +7215,11 @@ int saa7134_board_init2(struct saa7134_dev *dev) | |||
7215 | printk(KERN_INFO "%s: P7131 analog only, using " | 7215 | printk(KERN_INFO "%s: P7131 analog only, using " |
7216 | "entry of %s\n", | 7216 | "entry of %s\n", |
7217 | dev->name, saa7134_boards[dev->board].name); | 7217 | dev->name, saa7134_boards[dev->board].name); |
7218 | |||
7219 | /* IR init has already happened for other cards, so | ||
7220 | * we have to catch up. */ | ||
7221 | dev->has_remote = SAA7134_REMOTE_GPIO; | ||
7222 | saa7134_input_init1(dev); | ||
7218 | } | 7223 | } |
7219 | break; | 7224 | break; |
7220 | case SAA7134_BOARD_HAUPPAUGE_HVR1150: | 7225 | case SAA7134_BOARD_HAUPPAUGE_HVR1150: |