Commit 5e606abe authored Aug 28, 2015 by Tony Lindgren Committed by Linus Walleij Sep 14, 2015

gpio: omap: Fix gpiochip_add() handling for deferred probe



Currently we gpio-omap breaks if gpiochip_add() returns -EPROBE_DEFER:

[    0.570000] gpiochip_add: GPIOs 0..31 (gpio) failed to register
[    0.570000] omap_gpio 48310000.gpio: Could not register gpio chip -517
...
[    3.670000] omap_gpio 48310000.gpio: Unbalanced pm_runtime_enable!

Let's fix the issue by adding the missing pm_runtime_put() on error.

Cc: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: Javier Martinez Canillas <javier@dowhile0.org>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Santosh Shilimkar <ssantosh@kernel.org>
Acked-by: Santosh Shilimkar <ssantosh@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

parent e799f35c

drivers/gpio/gpio-omap.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1253,8 +1253,11 @@ static int omap_gpio_probe(struct platform_device *pdev)
		omap_gpio_mod_init(bank);

		ret = omap_gpio_chip_init(bank, irqc);
		if (ret)
		if (ret) {
		pm_runtime_put_sync(bank->dev);
		pm_runtime_disable(bank->dev);
		return ret;
		}

		omap_gpio_show_rev(bank);

Admin message