Skip to contentSkip to conversation

Patch "wm831x_power: Use IRQF_ONESHOT to request threaded IRQs" has been added to the 3.14-stable tree

PATCH [email protected] 1 participant 1 message Mar 1, 2016 Stable branch

lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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

wm831x_power: Use IRQF_ONESHOT to request threaded IRQs

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:
wm831x_power-use-irqf_oneshot-to-request-threaded-irqs.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 <[email protected]> know about it.

Quoted 1 line

From 90adf98d9530054b8e665ba5a928de4307231d84 Mon Sep 17 00:00:00 2001

From: Valentin Rothberg <[email protected]>
Date: Tue, 22 Sep 2015 19:00:40 +0200
Subject: wm831x_power: Use IRQF_ONESHOT to request threaded IRQs

From: Valentin Rothberg <[email protected]>

commit 90adf98d9530054b8e665ba5a928de4307231d84 upstream.

Since commit 1c6c69525b40 ("genirq: Reject bogus threaded irq requests") threaded IRQs without a primary handler need to be requested with IRQF_ONESHOT, otherwise the request will fail.

scripts/coccinelle/misc/irqf_oneshot.cocci detected this issue.

Fixes b5874f33bbaf ("wm831x_power: Use genirq")
---
 drivers/power/wm831x_power.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/power/wm831x_power.c +3 -3
@@ -567,7 +567,7 @@ static int wm831x_power_probe(struct pla
 
 	irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "SYSLO"));
 	ret = request_threaded_irq(irq, NULL, wm831x_syslo_irq,
-				   IRQF_TRIGGER_RISING, "System power low",
+				   IRQF_TRIGGER_RISING | IRQF_ONESHOT, "System power low",
 				   power);
 	if (ret != 0) {
 		dev_err(&pdev->dev, "Failed to request SYSLO IRQ %d: %d\n",
@@ -577,7 +577,7 @@ static int wm831x_power_probe(struct pla
 
 	irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "PWR SRC"));
 	ret = request_threaded_irq(irq, NULL, wm831x_pwr_src_irq,
-				   IRQF_TRIGGER_RISING, "Power source",
+				   IRQF_TRIGGER_RISING | IRQF_ONESHOT, "Power source",
 				   power);
 	if (ret != 0) {
 		dev_err(&pdev->dev, "Failed to request PWR SRC IRQ %d: %d\n",
@@ -590,7 +590,7 @@ static int wm831x_power_probe(struct pla
 				 platform_get_irq_byname(pdev,
 							 wm831x_bat_irqs[i]));
 		ret = request_threaded_irq(irq, NULL, wm831x_bat_irq,
-					   IRQF_TRIGGER_RISING,
+					   IRQF_TRIGGER_RISING | IRQF_ONESHOT,
 					   wm831x_bat_irqs[i],
 					   power);
 		if (ret != 0) {

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

queue-3.14/wm831x_power-use-irqf_oneshot-to-request-threaded-irqs.patch