ir-core: Fix the delete logic
authorMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 11 Apr 2010 03:26:23 +0000 (00:26 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 19 May 2010 15:57:38 +0000 (12:57 -0300)
Instead of removing an entry, the logic were doing both a deletion and
a key addition, as shown by the log:

[11517.323314] ir_getkeycode: unknown key for scancode 0x0050
[11517.326529] ir_do_setkeycode: #80: Deleting scan 0x0050
[11517.326529] ir_do_setkeycode: #80: New scan 0x0050 with key 0x0000
[11517.340598] ir_getkeycode: unknown key for scancode 0x0051
[11517.343811] ir_do_setkeycode: #81: Deleting scan 0x0051
[11517.343811] ir_do_setkeycode: #81: New scan 0x0051 with key 0x0000
[11517.357889] ir_getkeycode: unknown key for scancode 0x0052
[11517.361104] ir_do_setkeycode: #82: Deleting scan 0x0052
[11517.361104] ir_do_setkeycode: #82: New scan 0x0052 with key 0x0000
[11517.375453] ir_getkeycode: unknown key for scancode 0x0053
[11517.378474] ir_do_setkeycode: #83: Deleting scan 0x0053
[11517.378474] ir_do_setkeycode: #83: New scan 0x0053 with key 0x0000

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/IR/ir-keytable.c

index 599e39c34445b5ca7245ea5c4743817a08970cb8..1bb4e32f3dc3fef4ad7c1258a9e9694c068a845f 100644 (file)
@@ -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;