Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 328526
b: refs/heads/master
c: 9e14f36
h: refs/heads/master
v: v3
  • Loading branch information
Josh authored and Dmitry Torokhov committed Sep 5, 2012
1 parent a14ea78 commit 041f812
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e6c340171f0daaccc95b90abbeed2b837157ee11
refs/heads/master: 9e14f36bb577bd2828db5797303ca7bf6c87d50a
8 changes: 4 additions & 4 deletions trunk/drivers/input/keyboard/omap-keypad.c
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ static void omap_kp_tasklet(unsigned long data)
memcpy(keypad_state, new_state, sizeof(keypad_state));

if (key_down) {
int delay = HZ / 20;
int delay = HZ / 20;
/* some key is pressed - keep irq disabled and use timer
* to poll the keypad */
if (spurious)
Expand Down Expand Up @@ -413,18 +413,18 @@ static int __devinit omap_kp_probe(struct platform_device *pdev)
}
return 0;
err5:
for (i = irq_idx - 1; i >=0; i--)
for (i = irq_idx - 1; i >= 0; i--)
free_irq(row_gpios[i], omap_kp);
err4:
input_unregister_device(omap_kp->input);
input_dev = NULL;
err3:
device_remove_file(&pdev->dev, &dev_attr_enable);
err2:
for (i = row_idx - 1; i >=0; i--)
for (i = row_idx - 1; i >= 0; i--)
gpio_free(row_gpios[i]);
err1:
for (i = col_idx - 1; i >=0; i--)
for (i = col_idx - 1; i >= 0; i--)
gpio_free(col_gpios[i]);

kfree(omap_kp);
Expand Down

0 comments on commit 041f812

Please sign in to comment.