]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
gpio: rcar: Fix runtime PM imbalance on error
authorDinghao Liu <dinghao.liu@zju.edu.cn>
Fri, 22 May 2020 08:08:38 +0000 (16:08 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 Oct 2020 11:18:04 +0000 (13:18 +0200)
[ Upstream commit 6f8cd246411575703d9312888b70705c396b53a9 ]

pm_runtime_get_sync() increments the runtime PM usage counter even
when it returns an error code. Thus a pairing decrement is needed on
the error handling path to keep the counter balanced.

Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Link: https://lore.kernel.org/r/20200522080839.32612-1-dinghao.liu@zju.edu.cn
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpio/gpio-rcar.c

index 187984d26f47a94080a77e6d485501b6c8b8401b..f0b6c68e848e3a57bbfdc5223fff0de5cababd0e 100644 (file)
@@ -250,8 +250,10 @@ static int gpio_rcar_request(struct gpio_chip *chip, unsigned offset)
        int error;
 
        error = pm_runtime_get_sync(p->dev);
-       if (error < 0)
+       if (error < 0) {
+               pm_runtime_put(p->dev);
                return error;
+       }
 
        error = pinctrl_gpio_request(chip->base + offset);
        if (error)