From: Hans de Goede <hdegoede@redhat.com>
Date: Mon, 17 Feb 2014 21:19:43 +0000 (+0100)
Subject: pinctrl: sunxi: Fix masking when setting irq type
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=d82f94013a9897e02a93400e4c16efe82b530eaa;p=~andy%2Flinux

pinctrl: sunxi: Fix masking when setting irq type

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---

diff --git a/drivers/pinctrl/pinctrl-sunxi.c b/drivers/pinctrl/pinctrl-sunxi.c
index 787f352e346..f9fabe9bf47 100644
--- a/drivers/pinctrl/pinctrl-sunxi.c
+++ b/drivers/pinctrl/pinctrl-sunxi.c
@@ -585,7 +585,7 @@ static int sunxi_pinctrl_irq_set_type(struct irq_data *d,
 	spin_lock_irqsave(&pctl->lock, flags);
 
 	regval = readl(pctl->membase + reg);
-	regval &= ~IRQ_CFG_IRQ_MASK;
+	regval &= ~(IRQ_CFG_IRQ_MASK << index);
 	writel(regval | (mode << index), pctl->membase + reg);
 
 	spin_unlock_irqrestore(&pctl->lock, flags);