---

yaml --- r: 157184 b: refs/heads/master c: f4c5e80 h: refs/heads/master v: v3
git-mirror · Aug 31, 2009 · c6e0a56 · c6e0a56
1 parent c641daa
commit c6e0a56
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b808924d65a4d1a0332d0043e02e9eb5dafe32b
+refs/heads/master: f4c5e80faba8ae420d7dc5d9237cc1e0262d7386
diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c
@@ -2382,7 +2382,9 @@ void em28xx_card_setup(struct em28xx *dev)
 	}
 
 	em28xx_tuner_setup(dev);
-	em28xx_ir_init(dev);
+
+	if(!disable_ir)
+		em28xx_ir_init(dev);
 }