diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-29 18:40:17 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-29 18:40:17 +0100 |
| commit | 965abff8d8accdffc4af1b11fcf580e83031330a (patch) | |
| tree | ae81d9fa54daf543115f4bb791367b94707ee0ae /drivers/net/wireless/iwlwifi/mvm/mac80211.c | |
| parent | f04d4ffdd38dff05670ae34ca334276828012180 (diff) | |
| parent | 8bf3379a74bc9132751bfa685bad2da318fd59d7 (diff) | |
Merge tag 'v3.10.10' into linux-linaro-lsk
This is the 3.10.10 stable release
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mac80211.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mac80211.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c index b7e95b0a42b..f7545e06ce2 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c @@ -243,7 +243,11 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) if (ret) return ret; - return ieee80211_register_hw(mvm->hw); + ret = ieee80211_register_hw(mvm->hw); + if (ret) + iwl_mvm_leds_exit(mvm); + + return ret; } static void iwl_mvm_mac_tx(struct ieee80211_hw *hw, |