diff options
| author | Lee, Chun-Yi <joeyli.kernel@gmail.com> | 2011-05-31 14:20:11 +0800 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2011-07-07 10:38:58 -0400 |
| commit | ae821c1b2fff22a5b6002e093126156a6d7c8b7b (patch) | |
| tree | 40c8d843b942e693c2a382ba1d482cd074ef4f7b /drivers/platform | |
| parent | 92530664bbe5a13aede4a8763459bbe560ad9221 (diff) | |
| download | op-kernel-dev-ae821c1b2fff22a5b6002e093126156a6d7c8b7b.zip op-kernel-dev-ae821c1b2fff22a5b6002e093126156a6d7c8b7b.tar.gz | |
acer-wmi: fix bitwise bug when set device state
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 <linux-acpi@joern.heissler.de>
Cc: Carlos Corbacho <carlos@strangeworlds.co.uk>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Dmitry Torokhov <dtor@mail.ru>
Cc: Corentin Chary <corentincj@iksaif.net>
Cc: Thomas Renninger <trenn@suse.de>
Signed-off-by: Lee, Chun-Yi <jlee@novell.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/acer-wmi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index 942798c..e1c4938 100644 --- 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 = { |
