summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorGovert Overgaauw <govert.overgaauw@prodrive-technologies.com>2018-04-06 14:41:35 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-05-16 10:08:42 +0200
commit2b0e672598f9ae572b69898cb235fbeffc3e2f8e (patch)
tree506e8bcc38633c30a385571d0011fdc8180b2233 /drivers
parent31d04ca1eb232077e7d8032bc845bba6e6465d22 (diff)
gpio: fix aspeed_gpio unmask irq
commit f241632fd087d3d9fbd5450f4d8c8604badd8348 upstream. The unmask function disables all interrupts in a bank when unmasking an interrupt. Only disable the given interrupt. Cc: stable@vger.kernel.org Signed-off-by: Govert Overgaauw <govert.overgaauw@prodrive-technologies.com> 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-aspeed.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c
index 03a5925a423c..a9daf7121e6e 100644
--- a/drivers/gpio/gpio-aspeed.c
+++ b/drivers/gpio/gpio-aspeed.c
@@ -256,7 +256,7 @@ static void aspeed_gpio_irq_set_mask(struct irq_data *d, bool set)
if (set)
reg |= bit;
else
- reg &= bit;
+ reg &= ~bit;
iowrite32(reg, addr);
spin_unlock_irqrestore(&gpio->lock, flags);