iwlwifi: unregister LEDs if mac80211 registration fails
authorJohannes Berg <johannes.berg@intel.com>
Tue, 5 Jun 2012 07:38:35 +0000 (09:38 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 5 Jun 2012 18:27:30 +0000 (14:27 -0400)
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>
drivers/net/wireless/iwlwifi/iwl-mac80211.c

index 5d158ca9d246247c1f4a92fd8fbd4004020ba887..3ee23134c02b9b96ee184a5999e9577bf6452511 100644 (file)
@@ -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;