diff options
| author | Luciano Coelho <luciano.coelho@intel.com> | 2015-01-27 15:06:57 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-06 14:43:23 -0800 |
| commit | 5ac97a1b97e50ef197b64b72c1cd71779e4ecbbe (patch) | |
| tree | 8fe5c239232e82680dffa45ee8e7bc77fe314b98 /drivers/net | |
| parent | cd7cbf1c2c5e50b093d0640ffb2be627c80fbd5a (diff) | |
| download | lwn-5ac97a1b97e50ef197b64b72c1cd71779e4ecbbe.tar.gz lwn-5ac97a1b97e50ef197b64b72c1cd71779e4ecbbe.zip | |
iwlwifi: mvm: fix failure path when power_update fails in add_interface
commit fd66fc1cafd72ddf27dbec3a5e29e99839d1bc84 upstream.
When iwl_mvm_power_update_mac() is called, we have already added the
mac context, so if this call fails we should remove the mac.
Fixes: commit e5e7aa8e2561 ('iwlwifi: mvm: refactor power code')
Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net')
| -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 d06414ef15c5..e7e2a1bdd9ed 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c @@ -597,7 +597,7 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, ret = iwl_mvm_mac_ctxt_add(mvm, vif); if (ret) - goto out_release; + goto out_remove_mac; iwl_mvm_power_disable(mvm, vif); |