Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58d26c1e authored by Barry Song's avatar Barry Song Committed by Linus Walleij
Browse files

pinctrl: sirf: fix spinlock deadlock in sirfsoc_gpio_set_input 



sirfsoc_gpio_set_input() is called in those functions which have
held the spinlock, so delete the duplicated locking.

Signed-off-by: default avatarBarry Song <Baohua.Song@csr.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 8dd9766f

drivers/pinctrl/pinctrl-sirf.c

+0 −5
Original line number Diff line number Diff line
@@ -1458,15 +1458,10 @@ static void sirfsoc_gpio_handle_irq(unsigned int irq, struct irq_desc *desc) 
static inline void sirfsoc_gpio_set_input(struct sirfsoc_gpio_bank *bank, unsigned ctrl_offset)

{

	u32 val;

	unsigned long flags;



	spin_lock_irqsave(&bank->lock, flags);



	val = readl(bank->chip.regs + ctrl_offset);

	val &= ~SIRFSOC_GPIO_CTL_OUT_EN_MASK;

	writel(val, bank->chip.regs + ctrl_offset);



	spin_unlock_irqrestore(&bank->lock, flags);

}



static int sirfsoc_gpio_request(struct gpio_chip *chip, unsigned offset)