git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' into next
[sfrench/cifs-2.6.git]
/
drivers
/
input
/
mouse
/
elan_i2c_core.c
diff --git
a/drivers/input/mouse/elan_i2c_core.c
b/drivers/input/mouse/elan_i2c_core.c
index f9525d6f0bfe810c9ab1c2bd0a2a971f2e9695b4..2c0561e20b7fa28767e4228c0ae0d2535ef4107d 100644
(file)
--- a/
drivers/input/mouse/elan_i2c_core.c
+++ b/
drivers/input/mouse/elan_i2c_core.c
@@
-981,6
+981,8
@@
static irqreturn_t elan_isr(int irq, void *dev_id)
if (error)
goto out;
+ pm_wakeup_event(dev, 0);
+
switch (report[ETP_REPORT_ID_OFFSET]) {
case ETP_REPORT_ID:
elan_report_absolute(data, report);