projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'chrome-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/olof...
[linux-2.6-microblaze.git]
/
drivers
/
input
/
keyboard
/
cros_ec_keyb.c
diff --git
a/drivers/input/keyboard/cros_ec_keyb.c
b/drivers/input/keyboard/cros_ec_keyb.c
index
769f8f7
..
b50c5b8
100644
(file)
--- a/
drivers/input/keyboard/cros_ec_keyb.c
+++ b/
drivers/input/keyboard/cros_ec_keyb.c
@@
-341,7
+341,7
@@
static int cros_ec_keyb_resume(struct device *dev)
* wake source (e.g. the lid is open and the user might press a key to
* wake) then the key scan buffer should be preserved.
*/
- if (ckdev->ec->was_wake_device)
+ if (
!
ckdev->ec->was_wake_device)
cros_ec_keyb_clear_keyboard(ckdev);
return 0;