aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-04-10 23:26:23 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 11:57:38 -0400
commit09bd00e7e12bbc9ca0ba20e0511995cddd3c93b9 (patch)
tree895b10d5c7aa1bec5a6594a17fa97a81cd81a81a /drivers
parent3efaa062a9bd1cd41c4901b8f41718410452499c (diff)
ir-core: Fix the delete logic
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/IR/ir-keytable.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/IR/ir-keytable.c b/drivers/media/IR/ir-keytable.c
index 599e39c34445..1bb4e32f3dc3 100644
--- a/drivers/media/IR/ir-keytable.c
+++ b/drivers/media/IR/ir-keytable.c
@@ -127,7 +127,7 @@ static int ir_do_setkeycode(struct input_dev *dev,
127 break; 127 break;
128 } 128 }
129 129
130 if (old_keycode == KEY_RESERVED) { 130 if (old_keycode == KEY_RESERVED && keycode != KEY_RESERVED) {
131 /* No previous mapping found, we might need to grow the table */ 131 /* No previous mapping found, we might need to grow the table */
132 if (ir_resize_table(rc_tab)) 132 if (ir_resize_table(rc_tab))
133 return -ENOMEM; 133 return -ENOMEM;