projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9253066
)
acer-wmi: fix bitwise bug when set device state
author
Lee, Chun-Yi
<
[email protected]
>
Tue, 31 May 2011 06:20:11 +0000
(14:20 +0800)
committer
Matthew Garrett
<
[email protected]
>
Thu, 7 Jul 2011 14:38:58 +0000
(10:38 -0400)
Fix a bitwise bug that was found by Joern Heissler, it must be OR
but not AND when we query current device state.
Acked-by: Joern Heissler <
[email protected]
>
Cc: Carlos Corbacho <
[email protected]
>
Cc: Matthew Garrett <
[email protected]
>
Cc: Dmitry Torokhov <
[email protected]
>
Cc: Corentin Chary <
[email protected]
>
Cc: Thomas Renninger <
[email protected]
>
Signed-off-by: Lee, Chun-Yi <
[email protected]
>
Signed-off-by: Matthew Garrett <
[email protected]
>
drivers/platform/x86/acer-wmi.c
patch
|
blob
|
history
diff --git
a/drivers/platform/x86/acer-wmi.c
b/drivers/platform/x86/acer-wmi.c
index 942798ca96bc71468d83daa74fab63c84bc307eb..e1c4938b301bbcdacbcc1303e9b8cde5bf288585 100644
(file)
--- a/
drivers/platform/x86/acer-wmi.c
+++ b/
drivers/platform/x86/acer-wmi.c
@@
-1156,9
+1156,9
@@
static acpi_status wmid3_set_device_status(u32 value, u16 device)
struct wmid3_gds_input_param params = {
.function_num = 0x1,
.hotkey_number = 0x01,
- .devices = ACER_WMID3_GDS_WIRELESS
&
- ACER_WMID3_GDS_THREEG
&
- ACER_WMID3_GDS_WIMAX
&
+ .devices = ACER_WMID3_GDS_WIRELESS
|
+ ACER_WMID3_GDS_THREEG
|
+ ACER_WMID3_GDS_WIMAX
|
ACER_WMID3_GDS_BLUETOOTH,
};
struct acpi_buffer input = {