From: Alan Jenkins Date: Thu, 24 Sep 2009 19:15:24 +0000 (+0100) Subject: sony-laptop: check for rfkill hard block at load time X-Git-Tag: v2.6.32-rc3~12^2~48^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=50fab0760a6c07cded229357a1351c325a575770;p=profile%2Fcommon%2Fkernel-common.git sony-laptop: check for rfkill hard block at load time "I recently (on a flight) I found out that when I boot with the hard-switch activated, so turning off all wireless activity on my laptop, the state is not correctly announced in /dev/rfkill (reading it with rfkill command, or my own gnome applet)... After turning off and on again the hard-switch the events were right." We can fix this by querying the firmware at load time and calling rfkill_set_hw_state(). Signed-off-by: Alan Jenkins Tested-by: Norbert Preining Acked-by: Johannes Berg Acked-by: Mattia Dongili CC: stable@kernel.org Signed-off-by: John W. Linville --- diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index f9f68e0..f3466a0 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c @@ -1078,6 +1078,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 +1107,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);