From: Greg Kroah-Hartman Date: Mon, 6 Apr 2015 10:18:59 +0000 (+0200) Subject: Revert "iwlwifi: mvm: fix failure path when power_update fails in add_interface" X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=ecbd69c2b7872d7478a4e1726d2b9ada2fce558a;p=linux-edison.git Revert "iwlwifi: mvm: fix failure path when power_update fails in add_interface" This reverts commit fce2d025479af5e1fa6717480c7853cdfb8b71aa It was incorrectly applied, as it merged with fuzz. Reported-by: Jiri Slaby Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c index e6660d69200..ec0d32ad759 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c @@ -541,7 +541,7 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, ret = iwl_mvm_mac_ctxt_add(mvm, vif); if (ret) - goto out_remove_mac; + goto out_release; /* * Update power state on the new interface. Admittedly, based on