From: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Date: Fri, 25 Sep 2009 09:18:21 +0000 (+0100)
Subject: sony-laptop: re-read the rfkill state when resuming from suspend
X-Git-Tag: v6.6-pxa1908~37338^2^2
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=a0d97d6c7ceddc176b5eed171aa2a52e32cf3eda;p=linux.git

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>
---

diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index f3466a0fa25f..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;
 }