summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2013-09-24 15:47:41 +0800
committerLinus Walleij <linus.walleij@linaro.org>2013-09-27 14:19:59 +0200
commitfe4315c3b0cbd4ae5a0b7fcf42c265ed03e27d7a (patch)
tree61f38c653c217ab1bc930d1a15f29bb57348b0ac /drivers/pinctrl
parentc8690d6d2957ed060c1cba4cde3ec41e3829651b (diff)
pinctrl: adi2: Fix dead lock in adi_gpio_direction_output
Current code hold port->lock spinlock and then try to grab the lock again in adi_gpio_set_value(). Fix it. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r--drivers/pinctrl/pinctrl-adi2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-adi2.c b/drivers/pinctrl/pinctrl-adi2.c
index f2aa8773f4e..8089fda0042 100644
--- a/drivers/pinctrl/pinctrl-adi2.c
+++ b/drivers/pinctrl/pinctrl-adi2.c
@@ -776,10 +776,11 @@ static int adi_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
struct gpio_port_t *regs = port->regs;
unsigned long flags;
+ adi_gpio_set_value(chip, offset, value);
+
spin_lock_irqsave(&port->lock, flags);
writew(readw(&regs->inen) & ~(1 << offset), &regs->inen);
- adi_gpio_set_value(chip, offset, value);
writew(1 << offset, &regs->dir_set);
spin_unlock_irqrestore(&port->lock, flags);