summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2013-06-24 15:44:03 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-29 09:47:31 -0700
commit8351cafff00be058ce4db3753010632e29d104f3 (patch)
treec9053fa64538e324951d0478ed43a1946b81c7f7 /drivers/net
parent07e915c91b08d06db1e38241bc517e9b2e4fa3bd (diff)
downloadlinux-3.10-8351cafff00be058ce4db3753010632e29d104f3.tar.gz
linux-3.10-8351cafff00be058ce4db3753010632e29d104f3.tar.bz2
linux-3.10-8351cafff00be058ce4db3753010632e29d104f3.zip
iwlwifi: mvm: unregister leds when registration failed
commit b7327d89ae694a89f9934d428bde520b77b3131c upstream. This was missing and prevented any further attempts to load the module. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/mac80211.c6
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,