V4L/DVB (13100): cx23885: Add IR input keypress handling and enable for the HVR-1850

[deliverable/linux.git] / drivers / media / video / cx23885 / cx23885-ir.c

diff --git a/drivers/media/video/cx23885/cx23885-ir.c b/drivers/media/video/cx23885/cx23885-ir.c
index e84f90c75bf105ce8dd7ab81631d9dae0ee11cc1..6ae982cc985626fd9edac215117bfbeafe433e2c 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-ir.c
+++ b/drivers/media/video/cx23885/cx23885-ir.c
@@ -24,6 +24,7 @@
 #include <media/v4l2-device.h>
 
 #include "cx23885.h"
+#include "cx23885-input.h"
 
 #define CX23885_IR_RX_FIFO_SERVICE_REQ         0
 #define CX23885_IR_RX_END_OF_RX_DETECTED       1
@@ -51,6 +52,9 @@ void cx23885_ir_rx_work_handler(struct work_struct *work)
 
        if (events == 0)
                return;
+
+       if (dev->ir_input)
+               cx23885_input_rx_work_handler(dev, events);
 }
 
 void cx23885_ir_tx_work_handler(struct work_struct *work)