summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Grumbach2013-06-24 14:44:03 +0200
committerJohannes Berg2013-07-16 12:11:18 +0200
commitb7327d89ae694a89f9934d428bde520b77b3131c (patch)
tree8f89db12819f755ad2c6279d39f88e78c5e63ff9
parentLinux 3.11-rc1 (diff)
downloadkernel-qcow2-linux-b7327d89ae694a89f9934d428bde520b77b3131c.tar.gz
kernel-qcow2-linux-b7327d89ae694a89f9934d428bde520b77b3131c.tar.xz
kernel-qcow2-linux-b7327d89ae694a89f9934d428bde520b77b3131c.zip
iwlwifi: mvm: unregister leds when registration failed
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>
-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 e08683b20531..cab2f0c61ec7 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -257,7 +257,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,