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:02:12 +0200 |
| commit | ecbd69c2b7872d7478a4e1726d2b9ada2fce558a (patch) | |
| tree | 96de97d2f4a4e39dc6e6df94f15950841595130e /drivers/net/wireless | |
| parent | 58aef0a81c01a554a50d20138c71765c712f419b (diff) | |
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 <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
Diffstat (limited to 'drivers/net/wireless')
| -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 e6660d692008..ec0d32ad7592 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 |