From c6e0a56b348b24196f39e957c6b408140aaf6db9 Mon Sep 17 00:00:00 2001
From: Shine Liu <shinel@foxmail.com>
Date: Thu, 20 Aug 2009 23:49:26 -0300
Subject: [PATCH] --- yaml --- r: 157184 b: refs/heads/master c:
 f4c5e80faba8ae420d7dc5d9237cc1e0262d7386 h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/em28xx/em28xx-cards.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2dc619add451..4c04923c4835 100644
--- 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
index 494560e82311..1c2e544eda73 100644
--- 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);
 }