Patch "btmrvl: avoid double-disable_irq() race" has been added to the 4.9-stable tree

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

btmrvl: avoid double-disable_irq() race

to the 4.9-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:
btmrvl-avoid-double-disable_irq-race.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Jeffy Chen <[email protected]>
Date: Mon, 23 Jan 2017 12:18:51 +0800
Subject: btmrvl: avoid double-disable_irq() race

From: Jeffy Chen <[email protected]>

[ Upstream commit 9af02d86e11dc409e5c3de46e81c0a492ba58905 ]

It's much the same as what we did for mwifiex in:
b9da4d2 mwifiex: avoid double-disable_irq() race

"We have a race where the wakeup IRQ might be in flight while we're calling mwifiex_disable_wake() from resume(). This can leave us disabling the IRQ twice.

Let's disable the IRQ and enable it in case if we have double-disabled it."

---
 drivers/bluetooth/btmrvl_sdio.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

@@ -1682,8 +1682,12 @@ static int btmrvl_sdio_resume(struct dev
 	/* Disable platform specific wakeup interrupt */
 	if (card->plt_wake_cfg && card->plt_wake_cfg->irq_bt >= 0) {
 		disable_irq_wake(card->plt_wake_cfg->irq_bt);
-		if (!card->plt_wake_cfg->wake_by_bt)
-			disable_irq(card->plt_wake_cfg->irq_bt);
+		disable_irq(card->plt_wake_cfg->irq_bt);
+		if (card->plt_wake_cfg->wake_by_bt)
+			/* Undo our disable, since interrupt handler already
+			 * did this.
+			 */
+			enable_irq(card->plt_wake_cfg->irq_bt);
 	}
 
 	return 0;

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/btmrvl-avoid-double-disable_irq-race.patch