Commit 45b0335f authored by Valentin Rothberg's avatar Valentin Rothberg Committed by Greg Kroah-Hartman

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 avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a255d551
...@@ -567,7 +567,7 @@ static int wm831x_power_probe(struct platform_device *pdev) ...@@ -567,7 +567,7 @@ static int wm831x_power_probe(struct platform_device *pdev)
irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "SYSLO")); irq = wm831x_irq(wm831x, 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",
...@@ -577,7 +577,7 @@ static int wm831x_power_probe(struct platform_device *pdev) ...@@ -577,7 +577,7 @@ static int wm831x_power_probe(struct platform_device *pdev)
irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "PWR SRC")); irq = wm831x_irq(wm831x, 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",
...@@ -590,7 +590,7 @@ static int wm831x_power_probe(struct platform_device *pdev) ...@@ -590,7 +590,7 @@ static int wm831x_power_probe(struct platform_device *pdev)
platform_get_irq_byname(pdev, platform_get_irq_byname(pdev,
wm831x_bat_irqs[i])); 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