---

yaml --- r: 193000 b: refs/heads/master c: 09bd00e h: refs/heads/master v: v3
git-mirror · May 19, 2010 · 0e15406 · 0e15406
1 parent a2be6d2
commit 0e15406
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3efaa062a9bd1cd41c4901b8f41718410452499c
+refs/heads/master: 09bd00e7e12bbc9ca0ba20e0511995cddd3c93b9
diff --git a/trunk/drivers/media/IR/ir-keytable.c b/trunk/drivers/media/IR/ir-keytable.c
@@ -127,7 +127,7 @@ static int ir_do_setkeycode(struct input_dev *dev,
 		break;
 	}
 
-	if (old_keycode == KEY_RESERVED) {
+	if (old_keycode == KEY_RESERVED && keycode != KEY_RESERVED) {
 		/* No previous mapping found, we might need to grow the table */
 		if (ir_resize_table(rc_tab))
 			return -ENOMEM;