summaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorAlan Jenkins <alan-jenkins@tuffmail.co.uk>2009-09-25 10:18:21 +0100
committerJohn W. Linville <linville@tuxdriver.com>2009-09-28 16:55:08 -0400
commita0d97d6c7ceddc176b5eed171aa2a52e32cf3eda (patch)
tree41a10c5814fa40100925d82dde68d1dcbe5ea25b /drivers/platform
parent50fab0760a6c07cded229357a1351c325a575770 (diff)
downloadkernel-crypto-a0d97d6c7ceddc176b5eed171aa2a52e32cf3eda.tar.gz
kernel-crypto-a0d97d6c7ceddc176b5eed171aa2a52e32cf3eda.tar.xz
kernel-crypto-a0d97d6c7ceddc176b5eed171aa2a52e32cf3eda.zip
sony-laptop: re-read the rfkill state when resuming from suspend
Without this, the hard-blocked state will be reported incorrectly if the hardware switch is changed while the laptop is suspended. Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk> Tested-by: Norbert Preining <preining@logic.at> Acked-by: Mattia Dongili <malattia@linux.it> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/sony-laptop.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index f3466a0fa25..afdbdaaf80c 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;
}