projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes
[profile/ivi/kernel-x86-ivi.git]
/
drivers
/
input
/
keyboard
/
qt2160.c
diff --git
a/drivers/input/keyboard/qt2160.c
b/drivers/input/keyboard/qt2160.c
index
73ea4b0
..
031eed7
100644
(file)
--- a/
drivers/input/keyboard/qt2160.c
+++ b/
drivers/input/keyboard/qt2160.c
@@
-156,8
+156,7
@@
static irqreturn_t qt2160_irq(int irq, void *_qt2160)
spin_lock_irqsave(&qt2160->lock, flags);
- __cancel_delayed_work(&qt2160->dwork);
- schedule_delayed_work(&qt2160->dwork, 0);
+ mod_delayed_work(system_wq, &qt2160->dwork, 0);
spin_unlock_irqrestore(&qt2160->lock, flags);