From 4618b106f0964a2eb3f48eafecd8ed7ee6efa58a Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Tue, 4 May 2010 16:17:05 -0300
Subject: [PATCH] --- yaml --- r: 193162 b: refs/heads/master c:
 083e472176999de97848e5659cc958516ef81ecb h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/media/IR/imon.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 95b2f036c0cb..fb9a47c2037e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9986da291b533d4bda03f812ca01353852564900
+refs/heads/master: 083e472176999de97848e5659cc958516ef81ecb
diff --git a/trunk/drivers/media/IR/imon.c b/trunk/drivers/media/IR/imon.c
index ca2b49084d72..5e2045670004 100644
--- a/trunk/drivers/media/IR/imon.c
+++ b/trunk/drivers/media/IR/imon.c
@@ -55,7 +55,6 @@
 #define BIT_DURATION	250	/* each bit received is 250us */
 
 #define IMON_CLOCK_ENABLE_PACKETS	2
-#define IMON_KEY_RELEASE_OFFSET		1000
 
 /*** P R O T O T Y P E S ***/
 
@@ -1199,13 +1198,14 @@ static u32 imon_panel_key_lookup(u64 hw_code)
 {
 	int i;
 	u64 code = be64_to_cpu(hw_code);
-	u32 keycode;
+	u32 keycode = KEY_RESERVED;
 
-	for (i = 0; i < ARRAY_SIZE(imon_panel_key_table); i++)
-		if (imon_panel_key_table[i].hw_code == (code | 0xffee))
+	for (i = 0; i < ARRAY_SIZE(imon_panel_key_table); i++) {
+		if (imon_panel_key_table[i].hw_code == (code | 0xffee)) {
+			keycode = imon_panel_key_table[i].keycode;
 			break;
-
-	keycode = imon_panel_key_table[i % IMON_KEY_RELEASE_OFFSET].keycode;
+		}
+	}
 
 	return keycode;
 }