diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-06 12:18:59 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-13 14:03:01 +0200 |
| commit | d3f483f0a6728e08625dc43a73b69fda30117571 (patch) | |
| tree | 84d26f2e59c36c09ffd7b2933acbbfea430a0535 /drivers | |
| parent | 21fa7aacaeab9ddf6147b972ae52622424c57874 (diff) | |
Revert "iwlwifi: mvm: fix failure path when power_update fails in add_interface"
This reverts commit 5ac97a1b97e50ef197b64b72c1cd71779e4ecbbe
It was incorrectly applied, as it merged with fuzz.
Reported-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mac80211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c index a04174607e97..4a3b8b72c8af 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c @@ -594,7 +594,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; iwl_mvm_power_disable(mvm, vif); |