1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/media/rc/ir-nec-decoder.c b/drivers/media/rc/ir-nec-decoder.c
index 5d15c31288b..7b58b4a1729 100644
--- a/drivers/media/rc/ir-nec-decoder.c
+++ b/drivers/media/rc/ir-nec-decoder.c
@@ -88,9 +88,13 @@ static int ir_nec_decode(struct rc_dev *dev, struct ir_raw_event ev)
                         data->state = STATE_BIT_PULSE;
                         return 0;
                 } else if (eq_margin(ev.duration, NEC_REPEAT_SPACE, NEC_UNIT / 2)) {
-                        rc_repeat(dev);
-                        IR_dprintk(1, "Repeat last key\n");
-                        data->state = STATE_TRAILER_PULSE;
+                        if (!dev->keypressed) {
+                                IR_dprintk(1, "Discarding last key repeat: event after key up\n");
+                        } else {
+                                rc_repeat(dev);
+                                IR_dprintk(1, "Repeat last key\n");
+                                data->state = STATE_TRAILER_PULSE;
+                        }
                         return 0;
                 }