diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-04-18 12:59:16 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-04-18 12:59:16 +0800 |
| commit | 667ea3959654ae48ef303df13f2635fd07766cb4 (patch) | |
| tree | 7f284b5ec16d010773a1101e02b0acb141ae40f4 /drivers/net/wireless | |
| parent | 2dad587ec1dddf02a00d3b54156337a6dc79a752 (diff) | |
| parent | 6fb17a412207343151aac1fde91935a542339deb (diff) | |
Merge remote-tracking branch 'origin/v3.14/topic/overlayfs' into linux-linaro-lsk-v3.14
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); |