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 tag 'platform-drivers-x86-v3.19-1' of git://git.infradead.org/users/dvhart...
[sfrench/cifs-2.6.git]
/
drivers
/
platform
/
x86
/
msi-laptop.c
diff --git
a/drivers/platform/x86/msi-laptop.c
b/drivers/platform/x86/msi-laptop.c
index a3f06cb1063fda0655da8ca60f715d6cc35486c0..085987730aabbe6ac6e15f588ad11b04ce311e39 100644
(file)
--- a/
drivers/platform/x86/msi-laptop.c
+++ b/
drivers/platform/x86/msi-laptop.c
@@
-820,7
+820,7
@@
static bool msi_laptop_i8042_filter(unsigned char data, unsigned char str,
{
static bool extended;
- if (str &
0x20
)
+ if (str &
I8042_STR_AUXDATA
)
return false;
/* 0x54 wwan, 0x62 bluetooth, 0x76 wlan, 0xE4 touchpad toggle*/