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