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

Commit 46d4f7c2 authored by Tony Lindgren's avatar Tony Lindgren Committed by Linus Walleij
Browse files

gpio: omap: Fix GPIO numbering for deferred probe 



If gpio-omap probe fails with -EPROBE_DEFER, the GPIO numbering
keeps increasing. Only increase the gpio count if gpiochip_add()
was successful as otherwise the numbers will increase for each
probe attempt.

Cc: Javier Martinez Canillas <javier@dowhile0.org>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Santosh Shilimkar <ssantosh@kernel.org>
Reviewed-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent ae80d64e

drivers/gpio/gpio-omap.c

+3 −1
Original line number Diff line number Diff line
@@ -1098,7 +1098,6 @@ static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc) 
	} else {

		bank->chip.label = "gpio";

		bank->chip.base = gpio;

		gpio += bank->width;

	}

	bank->chip.ngpio = bank->width;
@@ -1108,6 +1107,9 @@ static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc) 
		return ret;

	}



	if (!bank->is_mpuio)

		gpio += bank->width;



#ifdef CONFIG_ARCH_OMAP1

	/*

	 * REVISIT: Once we have OMAP1 supporting SPARSE_IRQ, we can drop