summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2015-05-15 15:55:52 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-05-15 15:58:42 -0700
commitca8ff6ac455d6138be7228afd8590c6ddc46524f (patch)
treee08c47604cceedc9da644db6a07e2fe74aa356cf /drivers/input
parent4be01a2935fa3d745e023011cef3dd70e88f15f9 (diff)
downloadlinux-stable-ca8ff6ac455d6138be7228afd8590c6ddc46524f.tar.gz
linux-stable-ca8ff6ac455d6138be7228afd8590c6ddc46524f.tar.bz2
linux-stable-ca8ff6ac455d6138be7228afd8590c6ddc46524f.zip
Input: wm831x-on - pass the IRQF_ONESHOT flag
Since commit 1c6c69525b40eb76de8adf039409722015927dc3 ("genirq: Reject bogus threaded irq requests") threaded IRQs without a primary handler need to be requested with IRQF_ONESHOT, otherwise the request will fail. So pass the IRQF_ONESHOT flag in this case. The semantic patch that makes this change is available in scripts/coccinelle/misc/irqf_oneshot.cocci. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/misc/wm831x-on.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/misc/wm831x-on.c b/drivers/input/misc/wm831x-on.c
index 59d4f7bcb4a3..1b44de265a0a 100644
--- a/drivers/input/misc/wm831x-on.c
+++ b/drivers/input/misc/wm831x-on.c
@@ -99,7 +99,8 @@ static int wm831x_on_probe(struct platform_device *pdev)
wm831x_on->dev->dev.parent = &pdev->dev;
ret = request_threaded_irq(irq, NULL, wm831x_on_irq,
- IRQF_TRIGGER_RISING, "wm831x_on",
+ IRQF_TRIGGER_RISING | IRQF_ONESHOT,
+ "wm831x_on",
wm831x_on);
if (ret < 0) {
dev_err(&pdev->dev, "Unable to request IRQ: %d\n", ret);