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/rt2x00/rt2x00rfkill.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/rt2x00/rt2x00rfkill.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00rfkill.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00rfkill.c b/drivers/net/wireless/rt2x00/rt2x00rfkill.c index fcef9885ab5e..207281cfa8b7 100644 --- a/drivers/net/wireless/rt2x00/rt2x00rfkill.c +++ b/drivers/net/wireless/rt2x00/rt2x00rfkill.c @@ -45,14 +45,17 @@ static int rt2x00rfkill_toggle_radio(void *data, enum rfkill_state state) if (!test_bit(DEVICE_STARTED, &rt2x00dev->flags)) return 0; - if (state == RFKILL_STATE_ON) { + if (state == RFKILL_STATE_UNBLOCKED) { INFO(rt2x00dev, "Hardware button pressed, enabling radio.\n"); __clear_bit(DEVICE_DISABLED_RADIO_HW, &rt2x00dev->flags); retval = rt2x00lib_enable_radio(rt2x00dev); - } else if (state == RFKILL_STATE_OFF) { + } else if (state == RFKILL_STATE_SOFT_BLOCKED) { INFO(rt2x00dev, "Hardware button pressed, disabling radio.\n"); __set_bit(DEVICE_DISABLED_RADIO_HW, &rt2x00dev->flags); rt2x00lib_disable_radio(rt2x00dev); + } else { + WARNING(rt2x00dev, "Received unexpected rfkill state %d.\n", + state); } return retval; |