summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorIke Panhc <ike.pan@canonical.com>2010-10-01 15:39:05 +0800
committerMatthew Garrett <mjg@redhat.com>2010-10-21 09:36:49 -0400
commit8e7d354370f61cbe82a8b4a0f74224aed900b410 (patch)
treea91e29fd981992e2f3dc59e14418dbe2dc855160 /drivers
parent6a09f21dd1e205a68c8f8c4f39e4cff8f63801b6 (diff)
downloadlinux-8e7d354370f61cbe82a8b4a0f74224aed900b410.tar.gz
ideapad: check VPC bit before sync rfkill hw status
Check VPC bit to make sure the HW rfkill is touched. Signed-off-by: Ike Panhc <ike.pan@canonical.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/platform/x86/ideapad_acpi.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/platform/x86/ideapad_acpi.c b/drivers/platform/x86/ideapad_acpi.c
index c87693c7dde0..e07d6072e75c 100644
--- a/drivers/platform/x86/ideapad_acpi.c
+++ b/drivers/platform/x86/ideapad_acpi.c
@@ -379,7 +379,21 @@ static int ideapad_acpi_remove(struct acpi_device *adevice, int type)
static void ideapad_acpi_notify(struct acpi_device *adevice, u32 event)
{
- ideapad_sync_rfk_state(adevice);
+ acpi_handle handle = adevice->handle;
+ unsigned long vpc1, vpc2, vpc_bit;
+
+ if (read_ec_data(handle, 0x10, &vpc1))
+ return;
+ if (read_ec_data(handle, 0x1A, &vpc2))
+ return;
+
+ vpc1 = (vpc2 << 8) | vpc1;
+ for (vpc_bit = 0; vpc_bit < 16; vpc_bit++) {
+ if (test_bit(vpc_bit, &vpc1)) {
+ if (vpc_bit == 9)
+ ideapad_sync_rfk_state(adevice);
+ }
+ }
}
static struct acpi_driver ideapad_acpi_driver = {