3 files changed, 16 insertions, 18 deletions

diff --git a/drivers/media/video/cx23885/cx23885-input.c b/drivers/media/video/cx23885/cx23885-input.c
index 3f924e21b957..252817acc35b 100644
--- a/drivers/media/video/cx23885/cx23885-input.c
+++ b/drivers/media/video/cx23885/cx23885-input.c
@@ -46,12 +46,6 @@
 
 static void convert_measurement(u32 x, struct ir_raw_event *y)
 {
-        if (x == V4L2_SUBDEV_IR_PULSE_RX_SEQ_END) {
-                y->pulse = false;
-                y->duration = V4L2_SUBDEV_IR_PULSE_MAX_WIDTH_NS;
-                return;
-        }
-
         y->pulse = (x & V4L2_SUBDEV_IR_PULSE_LEVEL_MASK) ? true : false;
         y->duration = x & V4L2_SUBDEV_IR_PULSE_MAX_WIDTH_NS;
 }
diff --git a/drivers/media/video/cx23885/cx23888-ir.c b/drivers/media/video/cx23885/cx23888-ir.c
index aa07286b8d9b..684d23db98a7 100644
--- a/drivers/media/video/cx23885/cx23888-ir.c
+++ b/drivers/media/video/cx23885/cx23888-ir.c
@@ -675,16 +675,18 @@ static int cx23888_ir_rx_read(struct v4l2_subdev *sd, u8 *buf, size_t count,
         *num = n * sizeof(u32);
 
         for (p = (u32 *) buf, i = 0; i < n; p++, i++) {
+
                 if ((*p & FIFO_RXTX_RTO) == FIFO_RXTX_RTO) {
-                        *p = V4L2_SUBDEV_IR_PULSE_RX_SEQ_END;
+                        /* Assume RTO was because of no IR light input */
+                        u = 0;
                         v4l2_dbg(2, ir_888_debug, sd, "rx read: end of rx\n");
-                        continue;
+                } else {
+                        u = (*p & FIFO_RXTX_LVL)
+                                          ? V4L2_SUBDEV_IR_PULSE_LEVEL_MASK : 0;
+                        if (invert)
+                                u = u ? 0 : V4L2_SUBDEV_IR_PULSE_LEVEL_MASK;
                 }
 
-                u = (*p & FIFO_RXTX_LVL) ? V4L2_SUBDEV_IR_PULSE_LEVEL_MASK : 0;
-                if (invert)
-                        u = u ? 0 : V4L2_SUBDEV_IR_PULSE_LEVEL_MASK;
-
                 v = (u32) pulse_width_count_to_ns((u16) (*p & FIFO_RXTX),
                                                   divider);
                 if (v >= V4L2_SUBDEV_IR_PULSE_MAX_WIDTH_NS)
diff --git a/drivers/media/video/cx25840/cx25840-ir.c b/drivers/media/video/cx25840/cx25840-ir.c
index 326c2554c05c..be23c5b37a2f 100644
--- a/drivers/media/video/cx25840/cx25840-ir.c
+++ b/drivers/media/video/cx25840/cx25840-ir.c
@@ -677,16 +677,18 @@ static int cx25840_ir_rx_read(struct v4l2_subdev *sd, u8 *buf, size_t count,
         *num = n * sizeof(u32);
 
         for (p = (u32 *) buf, i = 0; i < n; p++, i++) {
+
                 if ((*p & FIFO_RXTX_RTO) == FIFO_RXTX_RTO) {
-                        *p = V4L2_SUBDEV_IR_PULSE_RX_SEQ_END;
+                        /* Assume RTO was because of no IR light input */
+                        u = 0;
                         v4l2_dbg(2, ir_debug, sd, "rx read: end of rx\n");
-                        continue;
+                } else {
+                        u = (*p & FIFO_RXTX_LVL)
+                                          ? V4L2_SUBDEV_IR_PULSE_LEVEL_MASK : 0;
+                        if (invert)
+                                u = u ? 0 : V4L2_SUBDEV_IR_PULSE_LEVEL_MASK;
                 }
 
-                u = (*p & FIFO_RXTX_LVL) ? V4L2_SUBDEV_IR_PULSE_LEVEL_MASK : 0;
-                if (invert)
-                        u = u ? 0 : V4L2_SUBDEV_IR_PULSE_LEVEL_MASK;
-
                 v = (u32) pulse_width_count_to_ns((u16) (*p & FIFO_RXTX),
                                                   divider);
                 if (v >= V4L2_SUBDEV_IR_PULSE_MAX_WIDTH_NS)