diff options
author | Matthew Garrett <mjg@redhat.com> | 2009-07-31 04:25:38 +0200 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-12-10 05:56:40 +0100 |
commit | e1fbf346c7c56d6b2f9d835d297bcb088baaff3a (patch) | |
tree | 556fc630ec6be97aacb8f01069d75d940dcee42c /drivers/platform/x86 | |
parent | Linux 2.6.32 (diff) | |
download | linux-e1fbf346c7c56d6b2f9d835d297bcb088baaff3a.tar.xz linux-e1fbf346c7c56d6b2f9d835d297bcb088baaff3a.zip |
dell-laptop: Fix rfkill state queries
The current code in dell-laptop is confused about the hardware rfkill
state. Fix it up such that it's always reported correctly.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Tested-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/platform/x86')
-rw-r--r-- | drivers/platform/x86/dell-laptop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index 74909c4aaeea..906111152b03 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c @@ -197,8 +197,8 @@ static void dell_rfkill_query(struct rfkill *rfkill, void *data) dell_send_request(&buffer, 17, 11); status = buffer.output[1]; - if (status & BIT(bit)) - rfkill_set_hw_state(rfkill, !!(status & BIT(16))); + rfkill_set_sw_state(rfkill, !!(status & BIT(bit))); + rfkill_set_hw_state(rfkill, !(status & BIT(16))); } static const struct rfkill_ops dell_rfkill_ops = { |