[PATCH 2/2] pinctrl: adi2: Fix dead lock inadi_gpio_direction_output

From: Axel Lin
Date: Tue Sep 24 2013 - 03:47:49 EST


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@xxxxxxxxxx>
---
drivers/pinctrl/pinctrl-adi2.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/pinctrl/pinctrl-adi2.c b/drivers/pinctrl/pinctrl-adi2.c
index f2aa877..8089fda 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);
--
1.8.1.2



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/