diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-29 09:57:58 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-29 09:57:58 +0400 |
| commit | 28f49d8fec19833672a6a813bfde0068fee50bc9 (patch) | |
| tree | 6905c5cabc063e44b891ae0af5b5d7cce69e6e71 /drivers/net/wireless/b43legacy/rfkill.c | |
| parent | 332e4af80d1214fbf0e263e1408fc7c5b64ecdd6 (diff) | |
| parent | ff28bd94e307c67abb1bccda5d3a9018bd798e08 (diff) | |
| download | linux-28f49d8fec19833672a6a813bfde0068fee50bc9.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/b43legacy/rfkill.c')
| -rw-r--r-- | drivers/net/wireless/b43legacy/rfkill.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43legacy/rfkill.c b/drivers/net/wireless/b43legacy/rfkill.c index d178dfbb1c9f..8935a302b220 100644 --- a/drivers/net/wireless/b43legacy/rfkill.c +++ b/drivers/net/wireless/b43legacy/rfkill.c @@ -90,7 +90,7 @@ static int b43legacy_rfkill_soft_toggle(void *data, enum rfkill_state state) goto out_unlock; err = 0; switch (state) { - case RFKILL_STATE_ON: + case RFKILL_STATE_UNBLOCKED: if (!dev->radio_hw_enable) { /* No luck. We can't toggle the hardware RF-kill * button from software. */ @@ -100,10 +100,14 @@ static int b43legacy_rfkill_soft_toggle(void *data, enum rfkill_state state) if (!dev->phy.radio_on) b43legacy_radio_turn_on(dev); break; - case RFKILL_STATE_OFF: + case RFKILL_STATE_SOFT_BLOCKED: if (dev->phy.radio_on) b43legacy_radio_turn_off(dev, 0); break; + default: + b43legacywarn(wl, "Received unexpected rfkill state %d.\n", + state); + break; } out_unlock: |