[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20150410131702.869719963@linuxfoundation.org>
Date: Fri, 10 Apr 2015 15:19:10 +0200
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
stable@...r.kernel.org, Jiri Slaby <jslaby@...e.cz>
Subject: [PATCH 3.14 22/38] Revert "iwlwifi: mvm: fix failure path when power_update fails in add_interface"
3.14-stable review patch. If anyone has any objections, please let me know.
------------------
This reverts commit 5ac97a1b97e50ef197b64b72c1cd71779e4ecbbe
It was incorrectly applied, as it merged with fuzz.
Reported-by: Jiri Slaby <jslaby@...e.cz>
Signed-off-by: Greg Kroah-Hartman gregkh@...uxfoundation.org
---
drivers/net/wireless/iwlwifi/mvm/mac80211.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- 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(str
ret = iwl_mvm_mac_ctxt_add(mvm, vif);
if (ret)
- goto out_remove_mac;
+ goto out_release;
iwl_mvm_power_disable(mvm, vif);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists