From 80e8848dfd476e428ea4509d92f0d840712f3e7d Mon Sep 17 00:00:00 2001
From: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Date: Fri, 25 Sep 2009 10:18:21 +0100
Subject: [PATCH] --- yaml --- r: 166575 b: refs/heads/master c:
 a0d97d6c7ceddc176b5eed171aa2a52e32cf3eda h: refs/heads/master i:   166573:
 ddb2ba0a0cf762e2a39cb79d64850a31b60f8c66   166571:
 60dda144dee481e45b22e7a65b9e1dd5ddbdd4d8   166567:
 1842b75b2d4689d08b8892b6e14da17b28ee0dfb   166559:
 b612343e5968ce78b895833b84c698cd0fe5e2cc v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/platform/x86/sony-laptop.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f137e98befcc..636c7ea771a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50fab0760a6c07cded229357a1351c325a575770
+refs/heads/master: a0d97d6c7ceddc176b5eed171aa2a52e32cf3eda
diff --git a/trunk/drivers/platform/x86/sony-laptop.c b/trunk/drivers/platform/x86/sony-laptop.c
index f3466a0fa25f..afdbdaaf80cb 100644
--- a/trunk/drivers/platform/x86/sony-laptop.c
+++ b/trunk/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;
 }