diff options
| author | Luciano Coelho | 2015-01-27 14:06:57 +0100 |
|---|---|---|
| committer | Emmanuel Grumbach | 2015-02-01 14:57:24 +0100 |
| commit | fd66fc1cafd72ddf27dbec3a5e29e99839d1bc84 (patch) | |
| tree | 1fcbf2db185f0cd7ca900367591e7977878249d8 /drivers/net/wireless/iwlwifi | |
| parent | iwlwifi: mvm: Fix a few EBS error handling bugs (diff) | |
| download | kernel-qcow2-linux-fd66fc1cafd72ddf27dbec3a5e29e99839d1bc84.tar.gz kernel-qcow2-linux-fd66fc1cafd72ddf27dbec3a5e29e99839d1bc84.tar.xz kernel-qcow2-linux-fd66fc1cafd72ddf27dbec3a5e29e99839d1bc84.zip | |
iwlwifi: mvm: fix failure path when power_update fails in add_interface
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.
CC: <stable@vger.kernel.org> [3.15+]
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>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
| -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 51e02e6ba0ac..1ff7ec08532d 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c @@ -1355,7 +1355,7 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, ret = iwl_mvm_power_update_mac(mvm); if (ret) - goto out_release; + goto out_remove_mac; /* beacon filtering */ ret = iwl_mvm_disable_beacon_filter(mvm, vif, 0); |