projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mac80211-next-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
drivers
/
input
/
keyboard
/
adp5588-keys.c
diff --git
a/drivers/input/keyboard/adp5588-keys.c
b/drivers/input/keyboard/adp5588-keys.c
index
b97ed44
..
21a62d0
100644
(file)
--- a/
drivers/input/keyboard/adp5588-keys.c
+++ b/
drivers/input/keyboard/adp5588-keys.c
@@
-587,6
+587,7
@@
static int adp5588_probe(struct i2c_client *client,
err_free_irq:
free_irq(client->irq, kpad);
+ cancel_delayed_work_sync(&kpad->work);
err_unreg_dev:
input_unregister_device(input);
input = NULL;