Patch "Revert "iwlwifi: mvm: fix failure path when power_update fails in add_interface"" has been added to the 3.14-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    Revert "iwlwifi: mvm: fix failure path when power_update fails in add_interface"

to the 3.14-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     revert-iwlwifi-mvm-fix-failure-path-when-power_update.patch
and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.


>From 349cf6f6b43986575af2ff253138df2453110d7b Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Date: Mon, 6 Apr 2015 12:18:59 +0200
Subject: Revert "iwlwifi: mvm: fix failure path when power_update fails in add_interface"

This reverts commit 5ac97a1b97e50ef197b64b72c1cd71779e4ecbbe

It was incorrectly applied, as it merged with fuzz.

Reported-by: Jiri Slaby <jslaby@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman gregkh@xxxxxxxxxxxxxxxxxxx

---
 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);
 


Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are

queue-3.14/clocksource-efm32-fix-a-null-pointer-dereference.patch
queue-3.14/regmap-regcache-rbtree-fix-present-bitmap-resize.patch
queue-3.14/nl80211-ignore-ht-vht-capabilities-without-qos-wmm.patch
queue-3.14/mac80211-drop-unencrypted-frames-in-mesh-fwding.patch
queue-3.14/clockevents-sun5i-fix-setup_irq-init-sequence.patch
queue-3.14/asoc-sgtl5000-remove-useless-register-write-clearing-chrgpump_powerup.patch
queue-3.14/asoc-adav80x-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.14/asoc-ak4641-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.14/mac80211-disable-u-apsd-queues-by-default.patch
queue-3.14/asoc-wm8904-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.14/asoc-wm8955-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.14/asoc-jz4740-remove-makefile-entry-for-removed-file.patch
queue-3.14/asoc-pcm1681-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.14/tcm_fc-missing-curly-braces-in-ft_invl_hw_context.patch
queue-3.14/asoc-wm8960-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.14/asoc-tas5086-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.14/asoc-wm2000-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.14/tcm_qla2xxx-fix-incorrect-use-of-__transport_register_session.patch
queue-3.14/revert-iwlwifi-mvm-fix-failure-path-when-power_update.patch
queue-3.14/asoc-cs4271-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.14/asoc-wm8731-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.14/asoc-wm8903-fix-wrong-value-references-for-boolean-kctl.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]