From 01a18b0386acf3dd1e7aa450391a3497f2665ea9 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Thu, 16 Jun 2011 16:18:37 -0300
Subject: [PATCH] --- yaml --- r: 254646 b: refs/heads/master c:
 3f5c4c73322e4d6f3d40b697dac3073d2adffe41 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/media/rc/ir-raw.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 44e198423b97..553773f46a23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4b0afee3c1730cf9b0f6ad21729928d23d3918e
+refs/heads/master: 3f5c4c73322e4d6f3d40b697dac3073d2adffe41
diff --git a/trunk/drivers/media/rc/ir-raw.c b/trunk/drivers/media/rc/ir-raw.c
index 11c19d8d0ee0..423ed45d6c55 100644
--- a/trunk/drivers/media/rc/ir-raw.c
+++ b/trunk/drivers/media/rc/ir-raw.c
@@ -114,18 +114,20 @@ int ir_raw_event_store_edge(struct rc_dev *dev, enum raw_event_type type)
 	s64			delta; /* ns */
 	DEFINE_IR_RAW_EVENT(ev);
 	int			rc = 0;
+	int			delay;
 
 	if (!dev->raw)
 		return -EINVAL;
 
 	now = ktime_get();
 	delta = ktime_to_ns(ktime_sub(now, dev->raw->last_event));
+	delay = MS_TO_NS(dev->input_dev->rep[REP_DELAY]);
 
 	/* Check for a long duration since last event or if we're
 	 * being called for the first time, note that delta can't
 	 * possibly be negative.
 	 */
-	if (delta > IR_MAX_DURATION || !dev->raw->last_type)
+	if (delta > delay || !dev->raw->last_type)
 		type |= IR_START_EVENT;
 	else
 		ev.duration = delta;