From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965067AbbDJNXU (ORCPT ); Fri, 10 Apr 2015 09:23:20 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:36812 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965027AbbDJNXI (ORCPT ); Fri, 10 Apr 2015 09:23:08 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jiri Slaby Subject: [PATCH 3.14 22/38] Revert "iwlwifi: mvm: fix failure path when power_update fails in add_interface" Date: Fri, 10 Apr 2015 15:19:10 +0200 Message-Id: <20150410131702.869719963@linuxfoundation.org> X-Mailer: git-send-email 2.3.5 In-Reply-To: <20150410131701.236830106@linuxfoundation.org> References: <20150410131701.236830106@linuxfoundation.org> User-Agent: quilt/0.64 MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.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);