diff options
| -rw-r--r-- | drivers/input/keyboard/omap-keypad.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c index a0222db4dc86..b03c5b954864 100644 --- a/drivers/input/keyboard/omap-keypad.c +++ b/drivers/input/keyboard/omap-keypad.c | |||
| @@ -214,7 +214,7 @@ static void omap_kp_tasklet(unsigned long data) | |||
| 214 | memcpy(keypad_state, new_state, sizeof(keypad_state)); | 214 | memcpy(keypad_state, new_state, sizeof(keypad_state)); |
| 215 | 215 | ||
| 216 | if (key_down) { | 216 | if (key_down) { |
| 217 | int delay = HZ / 20; | 217 | int delay = HZ / 20; |
| 218 | /* some key is pressed - keep irq disabled and use timer | 218 | /* some key is pressed - keep irq disabled and use timer |
| 219 | * to poll the keypad */ | 219 | * to poll the keypad */ |
| 220 | if (spurious) | 220 | if (spurious) |
| @@ -413,7 +413,7 @@ static int __devinit omap_kp_probe(struct platform_device *pdev) | |||
| 413 | } | 413 | } |
| 414 | return 0; | 414 | return 0; |
| 415 | err5: | 415 | err5: |
| 416 | for (i = irq_idx - 1; i >=0; i--) | 416 | for (i = irq_idx - 1; i >= 0; i--) |
| 417 | free_irq(row_gpios[i], omap_kp); | 417 | free_irq(row_gpios[i], omap_kp); |
| 418 | err4: | 418 | err4: |
| 419 | input_unregister_device(omap_kp->input); | 419 | input_unregister_device(omap_kp->input); |
| @@ -421,10 +421,10 @@ err4: | |||
| 421 | err3: | 421 | err3: |
| 422 | device_remove_file(&pdev->dev, &dev_attr_enable); | 422 | device_remove_file(&pdev->dev, &dev_attr_enable); |
| 423 | err2: | 423 | err2: |
| 424 | for (i = row_idx - 1; i >=0; i--) | 424 | for (i = row_idx - 1; i >= 0; i--) |
| 425 | gpio_free(row_gpios[i]); | 425 | gpio_free(row_gpios[i]); |
| 426 | err1: | 426 | err1: |
| 427 | for (i = col_idx - 1; i >=0; i--) | 427 | for (i = col_idx - 1; i >= 0; i--) |
| 428 | gpio_free(col_gpios[i]); | 428 | gpio_free(col_gpios[i]); |
| 429 | 429 | ||
| 430 | kfree(omap_kp); | 430 | kfree(omap_kp); |
