diff --git a/[refs] b/[refs]
index e245af80048c..980a5ad36405 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f69a23b795d6ee3673583146ed7efcbaaa5add18
+refs/heads/master: 0e1fa7ef25004b9c1a14147bce61c15c2f1c6744
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/trunk/drivers/net/wireless/iwlwifi/iwl-mac80211.c
index 5d158ca9d246..3ee23134c02b 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-mac80211.c
+++ b/trunk/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;