summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2016-08-29 11:24:10 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-07 15:21:19 +0200
commitb0e88ea4a43f44403d4e97fd2054f1b380a8f842 (patch)
tree80ec5205b327f8e05c8cd0e541419eba0b81d177 /drivers
parent7984b3d299209fa7f67b85f80b853c9451030f7a (diff)
downloadlinux-stable-b0e88ea4a43f44403d4e97fd2054f1b380a8f842.tar.gz
linux-stable-b0e88ea4a43f44403d4e97fd2054f1b380a8f842.tar.bz2
linux-stable-b0e88ea4a43f44403d4e97fd2054f1b380a8f842.zip
gpio: sa1100: fix irq probing for ucb1x00
commit 56beac95cb88c188d2a885825a5da131edb41fe3 upstream. ucb1x00 has used IRQ probing since it's dawn to find the GPIO interrupt that it's connected to. However, commit 23393d49fb75 ("gpio: kill off set_irq_flags usage") broke this by disabling IRQ probing on GPIO interrupts. Fix this. Fixes: 23393d49fb75 ("gpio: kill off set_irq_flags usage") Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpio/gpio-sa1100.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-sa1100.c b/drivers/gpio/gpio-sa1100.c
index 0c99e8fb9af3..8d8ee0ebf14c 100644
--- a/drivers/gpio/gpio-sa1100.c
+++ b/drivers/gpio/gpio-sa1100.c
@@ -155,7 +155,7 @@ static int sa1100_gpio_irqdomain_map(struct irq_domain *d,
{
irq_set_chip_and_handler(irq, &sa1100_gpio_irq_chip,
handle_edge_irq);
- irq_set_noprobe(irq);
+ irq_set_probe(irq);
return 0;
}