---

yaml --- r: 192811 b: refs/heads/master c: c6ebc6c h: refs/heads/master i: 192809: 57381ba 192807: 7d31d00 v: v3
git-mirror · May 18, 2010 · 306ca97 · 306ca97
1 parent e078aa6
commit 306ca97
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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: