dell-laptop: Don't read-back sw_state on machines with a hardware switch

On machines with a hardware switch, the blocking settings can not be changed
through a Fn + wireless-key combo, so there is no reason to read back the
blocking state from the BIOS.

Reading back is not only not necessary it is actually harmful, since on some
machines the blocking state will be cleared to all 0 after a wireless switch
toggle, even for radios not controlled by the hw-switch (yeah firmware bugs).

This causes "magic" changes to the sw_state. This is inconsistent with other
rfkill drivers which preserve the sw_state over a hw kill on / off.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
This commit is contained in:
Hans de Goede 2013-11-17 14:00:21 +01:00 committed by Matthew Garrett
parent 33f9359abb
commit 3f56588a79

View file

@ -428,7 +428,10 @@ static int dell_rfkill_set(void *data, bool blocked)
static void dell_rfkill_update_sw_state(struct rfkill *rfkill, int radio,
int status)
{
rfkill_set_sw_state(rfkill, !!(status & BIT(radio + 16)));
if (!(status & BIT(0))) {
/* No hw-switch, sync BIOS state to sw_state */
rfkill_set_sw_state(rfkill, !!(status & BIT(radio + 16)));
}
}
static void dell_rfkill_update_hw_state(struct rfkill *rfkill, int radio,