aboutsummaryrefslogtreecommitdiff
path: root/drivers/platform/x86/sony-laptop.c
diff options
context:
space:
mode:
authorAlan Jenkins <alan-jenkins@tuffmail.co.uk>2009-06-08 11:31:11 +0100
committerJohn W. Linville <linville@tuxdriver.com>2009-06-10 13:28:37 -0400
commit869fb3a46cd18235e6f176328a2d8085ffe2c704 (patch)
tree2ee3dcb0975b27cac8e238403fd449dcac7772cc /drivers/platform/x86/sony-laptop.c
parentb3fa1329eaf2a7b97124dacf5b663fd51346ac19 (diff)
downloadlinux-2.6.34-ux500-869fb3a46cd18235e6f176328a2d8085ffe2c704.tar.gz
sony-laptop: no need to unblock rfkill on load
The re-written rfkill core ensures rfkill devices are initialized to the system default state. The core calls set_block after registration so the driver shouldn't need to. Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/platform/x86/sony-laptop.c')
-rw-r--r--drivers/platform/x86/sony-laptop.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index f2893443b31..e48d9a4506f 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -1114,7 +1114,6 @@ static int sony_nc_setup_rfkill(struct acpi_device *device,
return err;
}
sony_rfkill_devices[nc_type] = rfk;
- sony_nc_rfkill_set((void *)nc_type, false);
return err;
}