Commit 7293a7e1 authored by Valentin Rothberg's avatar Valentin Rothberg Committed by Ben Hutchings

wm831x_power: Use IRQF_ONESHOT to request threaded IRQs

commit 90adf98d upstream.

Since commit 1c6c6952 ("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: b5874f33 ("wm831x_power: Use genirq")
Signed-off-by: default avatarValentin Rothberg <valentinrothberg@gmail.com>
Signed-off-by: default avatarSebastian Reichel <sre@kernel.org>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 604bfd00
...@@ -557,7 +557,7 @@ static __devinit int wm831x_power_probe(struct platform_device *pdev) ...@@ -557,7 +557,7 @@ static __devinit int wm831x_power_probe(struct platform_device *pdev)
irq = platform_get_irq_byname(pdev, "SYSLO"); irq = platform_get_irq_byname(pdev, "SYSLO");
ret = request_threaded_irq(irq, NULL, wm831x_syslo_irq, ret = request_threaded_irq(irq, NULL, wm831x_syslo_irq,
IRQF_TRIGGER_RISING, "System power low", IRQF_TRIGGER_RISING | IRQF_ONESHOT, "System power low",
power); power);
if (ret != 0) { if (ret != 0) {
dev_err(&pdev->dev, "Failed to request SYSLO IRQ %d: %d\n", dev_err(&pdev->dev, "Failed to request SYSLO IRQ %d: %d\n",
...@@ -567,7 +567,7 @@ static __devinit int wm831x_power_probe(struct platform_device *pdev) ...@@ -567,7 +567,7 @@ static __devinit int wm831x_power_probe(struct platform_device *pdev)
irq = platform_get_irq_byname(pdev, "PWR SRC"); irq = platform_get_irq_byname(pdev, "PWR SRC");
ret = request_threaded_irq(irq, NULL, wm831x_pwr_src_irq, ret = request_threaded_irq(irq, NULL, wm831x_pwr_src_irq,
IRQF_TRIGGER_RISING, "Power source", IRQF_TRIGGER_RISING | IRQF_ONESHOT, "Power source",
power); power);
if (ret != 0) { if (ret != 0) {
dev_err(&pdev->dev, "Failed to request PWR SRC IRQ %d: %d\n", dev_err(&pdev->dev, "Failed to request PWR SRC IRQ %d: %d\n",
...@@ -578,7 +578,7 @@ static __devinit int wm831x_power_probe(struct platform_device *pdev) ...@@ -578,7 +578,7 @@ static __devinit int wm831x_power_probe(struct platform_device *pdev)
for (i = 0; i < ARRAY_SIZE(wm831x_bat_irqs); i++) { for (i = 0; i < ARRAY_SIZE(wm831x_bat_irqs); i++) {
irq = platform_get_irq_byname(pdev, wm831x_bat_irqs[i]); irq = platform_get_irq_byname(pdev, wm831x_bat_irqs[i]);
ret = request_threaded_irq(irq, NULL, wm831x_bat_irq, ret = request_threaded_irq(irq, NULL, wm831x_bat_irq,
IRQF_TRIGGER_RISING, IRQF_TRIGGER_RISING | IRQF_ONESHOT,
wm831x_bat_irqs[i], wm831x_bat_irqs[i],
power); power);
if (ret != 0) { if (ret != 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment