summaryrefslogtreecommitdiffstats
path: root/drivers/irqchip/irq-keystone.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-06-16 23:06:56 +0100
committerThomas Gleixner <tglx@linutronix.de>2015-06-18 14:03:08 +0200
commit9414b6e2d55d0f7f07c3336d972818af366ae120 (patch)
treed03ac3f4500031142d88518a4a5cebb45dee120c /drivers/irqchip/irq-keystone.c
parente88d251d6a4fb719f9f667a397cf5d755121e551 (diff)
downloadblackbird-op-linux-9414b6e2d55d0f7f07c3336d972818af366ae120.tar.gz
blackbird-op-linux-9414b6e2d55d0f7f07c3336d972818af366ae120.zip
irq: irq-keystone: Fix race in installing chained IRQ handler
Fix a race where a pending interrupt could be received and the handler called before the handler's data has been setup, by converting to irq_set_chained_handler_and_data(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Cc: Alexandre Courbot <gnurou@gmail.com> Cc: Hans Ulli Kroll <ulli.kroll@googlemail.com> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Lee Jones <lee.jones@linaro.org> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Thierry Reding <thierry.reding@gmail.com> Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/E1Z4z0S-0002Ss-1V@rmk-PC.arm.linux.org.uk Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/irqchip/irq-keystone.c')
-rw-r--r--drivers/irqchip/irq-keystone.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-keystone.c b/drivers/irqchip/irq-keystone.c
index 5dc61655055a..81e3cf5b9a1f 100644
--- a/drivers/irqchip/irq-keystone.c
+++ b/drivers/irqchip/irq-keystone.c
@@ -184,8 +184,7 @@ static int keystone_irq_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, kirq);
- irq_set_chained_handler(kirq->irq, keystone_irq_handler);
- irq_set_handler_data(kirq->irq, kirq);
+ irq_set_chained_handler_and_data(kirq->irq, keystone_irq_handler, kirq);
/* clear all source bits */
keystone_irq_writel(kirq, ~0x0);
OpenPOWER on IntegriCloud