aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-06-05 09:38:35 +0200
committerJohn W. Linville <linville@tuxdriver.com>2012-06-05 14:27:30 -0400
commit0e1fa7ef25004b9c1a14147bce61c15c2f1c6744 (patch)
tree835c3b2e8a8d6ec2e1522cc5ebf628513ab5316b
parentiwlwifi: fix double free/complete in firmware loading (diff)
downloadlinux-dev-0e1fa7ef25004b9c1a14147bce61c15c2f1c6744.tar.xz
linux-dev-0e1fa7ef25004b9c1a14147bce61c15c2f1c6744.zip
iwlwifi: unregister LEDs if mac80211 registration fails
Otherwise the LEDs stick around and cause issues the next time around since they're still there but not really hooked up. Cc: stable@kernel.org Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-mac80211.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
index 5d158ca9d246..3ee23134c02b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c
+++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
@@ -251,6 +251,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
ret = ieee80211_register_hw(priv->hw);
if (ret) {
IWL_ERR(priv, "Failed to register hw (error %d)\n", ret);
+ iwl_leds_exit(priv);
return ret;
}
priv->mac80211_registered = 1;