gpio: arizona: put pm_runtime in case of failure
[ Upstream commit 861254d826
]
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>
This commit is contained in:
parent
52083907eb
commit
de0d953ee7
|
@ -64,6 +64,7 @@ static int arizona_gpio_get(struct gpio_chip *chip, unsigned offset)
|
||||||
ret = pm_runtime_get_sync(chip->parent);
|
ret = pm_runtime_get_sync(chip->parent);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
dev_err(chip->parent, "Failed to resume: %d\n", ret);
|
dev_err(chip->parent, "Failed to resume: %d\n", ret);
|
||||||
|
pm_runtime_put_autosuspend(chip->parent);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -72,12 +73,15 @@ static int arizona_gpio_get(struct gpio_chip *chip, unsigned offset)
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
dev_err(chip->parent, "Failed to drop cache: %d\n",
|
dev_err(chip->parent, "Failed to drop cache: %d\n",
|
||||||
ret);
|
ret);
|
||||||
|
pm_runtime_put_autosuspend(chip->parent);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = regmap_read(arizona->regmap, reg, &val);
|
ret = regmap_read(arizona->regmap, reg, &val);
|
||||||
if (ret < 0)
|
if (ret < 0) {
|
||||||
|
pm_runtime_put_autosuspend(chip->parent);
|
||||||
return ret;
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
pm_runtime_mark_last_busy(chip->parent);
|
pm_runtime_mark_last_busy(chip->parent);
|
||||||
pm_runtime_put_autosuspend(chip->parent);
|
pm_runtime_put_autosuspend(chip->parent);
|
||||||
|
|
Loading…
Reference in New Issue