diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-29 01:50:06 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-29 01:50:06 +0400 |
| commit | eb1cf0f8f7a9e5a6d573d5bd72c015686a042db0 (patch) | |
| tree | ee5e1e52ef663e1a4d19c7abd6477a8ed75fda41 /drivers/platform/x86 | |
| parent | 47379052b5c87707bc6e20a2a4f6ac156fb8357c (diff) | |
| parent | a0d97d6c7ceddc176b5eed171aa2a52e32cf3eda (diff) | |
| download | linux-eb1cf0f8f7a9e5a6d573d5bd72c015686a042db0.tar.xz | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/platform/x86')
| -rw-r--r-- | drivers/platform/x86/sony-laptop.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index f9f68e0e7344..afdbdaaf80cb 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c @@ -1041,6 +1041,9 @@ static int sony_nc_resume(struct acpi_device *device) sony_backlight_update_status(sony_backlight_device) < 0) printk(KERN_WARNING DRV_PFX "unable to restore brightness level\n"); + /* re-read rfkill state */ + sony_nc_rfkill_update(); + return 0; } @@ -1078,6 +1081,8 @@ static int sony_nc_setup_rfkill(struct acpi_device *device, struct rfkill *rfk; enum rfkill_type type; const char *name; + int result; + bool hwblock; switch (nc_type) { case SONY_WIFI: @@ -1105,6 +1110,10 @@ static int sony_nc_setup_rfkill(struct acpi_device *device, if (!rfk) return -ENOMEM; + sony_call_snc_handle(0x124, 0x200, &result); + hwblock = !(result & 0x1); + rfkill_set_hw_state(rfk, hwblock); + err = rfkill_register(rfk); if (err) { rfkill_destroy(rfk); |