lkml.org 
[lkml]   [2020]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 02/64] gpio: arizona: put pm_runtime in case of failure
    Date
    From: Navid Emamdoost <navid.emamdoost@gmail.com>

    [ Upstream commit 861254d826499944cb4d9b5a15f5a794a6b99a69 ]

    Calling pm_runtime_get_sync increments the counter even in case of
    failure, causing incorrect ref count if pm_runtime_put is not called in
    error handling paths. Call pm_runtime_put if pm_runtime_get_sync fails.

    Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
    Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
    Link: https://lore.kernel.org/r/20200605030052.78235-1-navid.emamdoost@gmail.com
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpio/gpio-arizona.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/drivers/gpio/gpio-arizona.c b/drivers/gpio/gpio-arizona.c
    index e09834b91ea52..694674dfbf82a 100644
    --- a/drivers/gpio/gpio-arizona.c
    +++ b/drivers/gpio/gpio-arizona.c
    @@ -69,6 +69,7 @@ static int arizona_gpio_get(struct gpio_chip *chip, unsigned offset)
    ret = pm_runtime_get_sync(chip->parent);
    if (ret < 0) {
    dev_err(chip->parent, "Failed to resume: %d\n", ret);
    + pm_runtime_put_autosuspend(chip->parent);
    return ret;
    }

    @@ -77,12 +78,15 @@ static int arizona_gpio_get(struct gpio_chip *chip, unsigned offset)
    if (ret < 0) {
    dev_err(chip->parent, "Failed to drop cache: %d\n",
    ret);
    + pm_runtime_put_autosuspend(chip->parent);
    return ret;
    }

    ret = regmap_read(arizona->regmap, reg, &val);
    - if (ret < 0)
    + if (ret < 0) {
    + pm_runtime_put_autosuspend(chip->parent);
    return ret;
    + }

    pm_runtime_mark_last_busy(chip->parent);
    pm_runtime_put_autosuspend(chip->parent);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-07-27 16:44    [W:4.153 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site