Return-path: Received: from mail-ew0-f211.google.com ([209.85.219.211]:59660 "EHLO mail-ew0-f211.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753223AbZIXTP1 (ORCPT ); Thu, 24 Sep 2009 15:15:27 -0400 Received: by ewy7 with SMTP id 7so1954548ewy.17 for ; Thu, 24 Sep 2009 12:15:29 -0700 (PDT) Message-ID: <4ABBC54C.5010103@tuffmail.co.uk> Date: Thu, 24 Sep 2009 20:15:24 +0100 From: Alan Jenkins MIME-Version: 1.0 To: Mattia Dongili CC: "linux-wireless@vger.kernel.org" , Norbert Preining , Johannes Berg , "Almer S. Tigelaar" , Matthias Welwarsky Subject: [PATCH] sony-laptop: check for rfkill hard block at load time References: <20090924130231.GU21590@gamma.logic.tuwien.ac.at> <1253801252.3868.108.camel@johannes.local> <4ABB89B2.8070302@tuffmail.co.uk> <1253804713.3868.168.camel@johannes.local> <4ABB8C5E.6070402@tuffmail.co.uk> <1253813371.3868.313.camel@johannes.local> In-Reply-To: <1253813371.3868.313.camel@johannes.local> Content-Type: text/plain; charset=UTF-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: "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 --- drivers/platform/x86/sony-laptop.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index dafaa4a..a234a9d 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c @@ -1081,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: @@ -1108,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); -- 1.6.3.2