diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-04-18 13:08:20 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-04-18 13:08:20 +0800 |
| commit | b060bcac5b8549066aa827b6236b0412dcb7d7b3 (patch) | |
| tree | d9ade8aa9104e83a314730b2ec2a1adc5cd5cffe /drivers/net/wireless | |
| parent | d551f37d757c5d0463dfa175a2885fd9f2063a12 (diff) | |
| parent | 667ea3959654ae48ef303df13f2635fd07766cb4 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rt
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 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); |