From 306ca97c29d204136fb08790d93cc8a694bdc30e Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sun, 14 Mar 2010 22:57:56 -0300 Subject: [PATCH] --- yaml --- r: 192811 b: refs/heads/master c: c6ebc6c4acbedcc766a8af147ccb9c39e77578ae h: refs/heads/master i: 192809: 57381ba03a0b8a68cb289c45d9d13625cbcc3626 192807: 7d31d005329be47ede5dadf4c46395a886cc49f7 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7134/saa7134-cards.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b871198c2fc4..5c0d6eada7f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2415a2c14ef5fde98d61e3af4c5ff6e019659799 +refs/heads/master: c6ebc6c4acbedcc766a8af147ccb9c39e77578ae diff --git a/trunk/drivers/media/video/saa7134/saa7134-cards.c b/trunk/drivers/media/video/saa7134/saa7134-cards.c index 297833fb3b4a..aa07cb11e104 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-cards.c +++ b/trunk/drivers/media/video/saa7134/saa7134-cards.c @@ -7215,6 +7215,11 @@ int saa7134_board_init2(struct saa7134_dev *dev) printk(KERN_INFO "%s: P7131 analog only, using " "entry of %s\n", dev->name, saa7134_boards[dev->board].name); + + /* IR init has already happened for other cards, so + * we have to catch up. */ + dev->has_remote = SAA7134_REMOTE_GPIO; + saa7134_input_init1(dev); } break; case SAA7134_BOARD_HAUPPAUGE_HVR1150: