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

Commit 21d4de14 authored by Dan Carpenter's avatar Dan Carpenter Committed by Linus Walleij
Browse files

gpio: pl061: returning with lock held in pl061_irq_type() 



We were returning with "chip->lock" held by mistake.  It's safe to
move the return to before we take the spinlock.

Fixes: 1dbf7f29 ('gpio: pl061: detail IRQ trigger handling')
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 78856ac0

drivers/gpio/gpio-pl061.c

+7 −6
Original line number Diff line number Diff line
@@ -152,12 +152,6 @@ static int pl061_irq_type(struct irq_data *d, unsigned trigger) 
	if (offset < 0 || offset >= PL061_GPIO_NR)

		return -EINVAL;



	spin_lock_irqsave(&chip->lock, flags);



	gpioiev = readb(chip->base + GPIOIEV);

	gpiois = readb(chip->base + GPIOIS);

	gpioibe = readb(chip->base + GPIOIBE);



	if ((trigger & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)) &&

	    (trigger & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING)))

	{
@@ -168,6 +162,13 @@ static int pl061_irq_type(struct irq_data *d, unsigned trigger) 
		return -EINVAL;

	}





	spin_lock_irqsave(&chip->lock, flags);



	gpioiev = readb(chip->base + GPIOIEV);

	gpiois = readb(chip->base + GPIOIS);

	gpioibe = readb(chip->base + GPIOIBE);



	if (trigger & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)) {

		bool polarity = trigger & IRQ_TYPE_LEVEL_HIGH;