2 files changed, 10 insertions, 5 deletions

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index c55634a674ba..a3d6d4ab9bc7 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -299,6 +299,7 @@ struct em28xx_board em28xx_boards[] = {
         [EM2820_BOARD_TERRATEC_CINERGY_250] = {
                 .name         = "Terratec Cinergy 250 USB",
                 .tuner_type   = TUNER_LG_PAL_NEW_TAPC,
+                .has_ir_i2c   = 1,
                 .tda9887_conf = TDA9887_PRESENT,
                 .decoder      = EM28XX_SAA711X,
                 .input        = { {
@@ -318,6 +319,7 @@ struct em28xx_board em28xx_boards[] = {
         [EM2820_BOARD_PINNACLE_USB_2] = {
                 .name         = "Pinnacle PCTV USB 2",
                 .tuner_type   = TUNER_LG_PAL_NEW_TAPC,
+                .has_ir_i2c   = 1,
                 .tda9887_conf = TDA9887_PRESENT,
                 .decoder      = EM28XX_SAA711X,
                 .input        = { {
@@ -342,6 +344,7 @@ struct em28xx_board em28xx_boards[] = {
                                 TDA9887_PORT2_ACTIVE,
                 .decoder      = EM28XX_TVP5150,
                 .has_msp34xx  = 1,
+                .has_ir_i2c   = 1,
                 .input        = { {
                         .type     = EM28XX_VMUX_TELEVISION,
                         .vmux     = TVP5150_COMPOSITE0,
@@ -960,6 +963,7 @@ struct em28xx_board em28xx_boards[] = {
         [EM2800_BOARD_TERRATEC_CINERGY_200] = {
                 .name         = "Terratec Cinergy 200 USB",
                 .is_em2800    = 1,
+                .has_ir_i2c   = 1,
                 .tuner_type   = TUNER_LG_PAL_NEW_TAPC,
                 .tda9887_conf = TDA9887_PRESENT,
                 .decoder      = EM28XX_SAA711X,
@@ -2277,7 +2281,7 @@ void em28xx_card_setup(struct em28xx *dev)
         case EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950:
         {
                 struct tveeprom tv;
-#ifdef CONFIG_MODULES
+#if defined(CONFIG_MODULES) && defined(MODULE)
                 request_module("tveeprom");
 #endif
                 /* Call first TVeeprom */
@@ -2291,10 +2295,6 @@ void em28xx_card_setup(struct em28xx *dev)
                         dev->i2s_speed = 2048000;
                         dev->board.has_msp34xx = 1;
                 }
-#ifdef CONFIG_MODULES
-                if (tv.has_ir)
-                        request_module("ir-kbd-i2c");
-#endif
                 break;
         }
         case EM2882_BOARD_KWORLD_ATSC_315U:
@@ -2335,6 +2335,10 @@ void em28xx_card_setup(struct em28xx *dev)
                 break;
         }
 
+#if defined(CONFIG_MODULES) && defined(MODULE)
+        if (dev->board.has_ir_i2c && !disable_ir)
+                request_module("ir-kbd-i2c");
+#endif
         if (dev->board.has_snapshot_button)
                 em28xx_register_snapshot_button(dev);
 
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index bc825bdd65be..0f2ba9a40d17 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -399,6 +399,7 @@ struct em28xx_board {
         unsigned int has_snapshot_button:1;
         unsigned int is_webcam:1;
         unsigned int valid:1;
+        unsigned int has_ir_i2c:1;
 
         unsigned char xclk, i2c_speed;
         unsigned char radio_addr;