Revert "iwlwifi: mvm: fix failure path when power_update fails in add_interface"
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 Apr 2015 10:18:59 +0000 (12:18 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 13 Apr 2015 12:02:12 +0000 (14:02 +0200)
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
drivers/net/wireless/iwlwifi/mvm/mac80211.c

index e6660d6920082dfd94b1efafa312837ea4397854..ec0d32ad7592ad3ae9e6b22ced07cc69879009bd 100644 (file)
@@ -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