1 files changed, 9 insertions, 2 deletions

diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index bfdf79f1033c..4b5aa08036fa 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -28,6 +28,7 @@
 #include "cx23885.h"
 #include "tuner-xc2028.h"
 #include "netup-init.h"
+#include "cx23888-ir.h"
 
 /* ------------------------------------------------------------------ */
 /* board config info                                                  */
@@ -801,6 +802,7 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
 
 int cx23885_ir_init(struct cx23885_dev *dev)
 {
+        int ret = 0;
         switch (dev->board) {
         case CX23885_BOARD_HAUPPAUGE_HVR1250:
         case CX23885_BOARD_HAUPPAUGE_HVR1500:
@@ -812,15 +814,20 @@ int cx23885_ir_init(struct cx23885_dev *dev)
         case CX23885_BOARD_HAUPPAUGE_HVR1275:
         case CX23885_BOARD_HAUPPAUGE_HVR1255:
         case CX23885_BOARD_HAUPPAUGE_HVR1210:
-        case CX23885_BOARD_HAUPPAUGE_HVR1850:
                 /* FIXME: Implement me */
                 break;
+        case CX23885_BOARD_HAUPPAUGE_HVR1850:
+                ret = cx23888_ir_probe(dev);
+                if (ret)
+                        break;
+                dev->sd_ir = cx23885_find_hw(dev, CX23885_HW_888_IR);
+                break;
         case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:
                 request_module("ir-kbd-i2c");
                 break;
         }
 
-        return 0;
+        return ret;
 }
 
 void cx23885_card_setup(struct cx23885_dev *dev)