Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sony-laptop: check for rfkill hard block at load time

Browse source 
"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 <alan-jenkins@tuffmail.co.uk>
Tested-by: Norbert Preining <preining@logic.at>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Mattia Dongili <malattia@linux.it>
CC: stable@kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Alan Jenkins 2009-09-24 20:15:24 +01:00 committed by John W. Linville
parent 8f1546cadf
commit 50fab0760a
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/platform/x86/sony-laptop.c
View file

@ -1078,6 +1078,8 @@ static int sony_nc_setup_rfkill(struct acpi_device *device,
struct rfkill *rfk; struct rfkill *rfk;
enum rfkill_type type; enum rfkill_type type;
const char *name; const char *name;
int result;
bool hwblock;
switch (nc_type) { switch (nc_type) {
case SONY_WIFI: case SONY_WIFI:
@ -1105,6 +1107,10 @@ static int sony_nc_setup_rfkill(struct acpi_device *device,
if (!rfk) if (!rfk)
return -ENOMEM; return -ENOMEM;
sony_call_snc_handle(0x124, 0x200, &result);
hwblock = !(result & 0x1);
rfkill_set_hw_state(rfk, hwblock);
err = rfkill_register(rfk); err = rfkill_register(rfk);
if (err) { if (err) {
rfkill_destroy(rfk); rfkill_destroy(rfk);