diff options
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 73942a4f215e..3bc2644039f0 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -8287,17 +8287,20 @@ static int iwl3945_rfkill_soft_rf_kill(void *data, enum rfkill_state state) | |||
8287 | mutex_lock(&priv->mutex); | 8287 | mutex_lock(&priv->mutex); |
8288 | 8288 | ||
8289 | switch (state) { | 8289 | switch (state) { |
8290 | case RFKILL_STATE_ON: | 8290 | case RFKILL_STATE_UNBLOCKED: |
8291 | iwl3945_radio_kill_sw(priv, 0); | 8291 | iwl3945_radio_kill_sw(priv, 0); |
8292 | /* if HW rf-kill is set dont allow ON state */ | 8292 | /* if HW rf-kill is set dont allow ON state */ |
8293 | if (iwl3945_is_rfkill(priv)) | 8293 | if (iwl3945_is_rfkill(priv)) |
8294 | err = -EBUSY; | 8294 | err = -EBUSY; |
8295 | break; | 8295 | break; |
8296 | case RFKILL_STATE_OFF: | 8296 | case RFKILL_STATE_SOFT_BLOCKED: |
8297 | iwl3945_radio_kill_sw(priv, 1); | 8297 | iwl3945_radio_kill_sw(priv, 1); |
8298 | if (!iwl3945_is_rfkill(priv)) | 8298 | if (!iwl3945_is_rfkill(priv)) |
8299 | err = -EBUSY; | 8299 | err = -EBUSY; |
8300 | break; | 8300 | break; |
8301 | default: | ||
8302 | IWL_WARNING("we recieved unexpected RFKILL state %d\n", state); | ||
8303 | break; | ||
8301 | } | 8304 | } |
8302 | mutex_unlock(&priv->mutex); | 8305 | mutex_unlock(&priv->mutex); |
8303 | 8306 | ||