| Message ID | 20200525110540.6949-1-dinghao.liu@zju.edu.cn (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | [v2] power: supply: bq24190_charger: Fix runtime PM imbalance on error | expand |
On Mon, May 25, 2020 at 1:05 PM Dinghao Liu <dinghao.liu@zju.edu.cn> wrote: > > pm_runtime_get_sync() increments the runtime PM usage counter even > 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> Better now: Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > > Changelog: > > v2: - Use pm_runtime_put_noidle() rather than > pm_runtime_put_autosuspend(). > --- > drivers/power/supply/bq24190_charger.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/power/supply/bq24190_charger.c b/drivers/power/supply/bq24190_charger.c > index 453d6332d43a..7b24c41a2137 100644 > --- a/drivers/power/supply/bq24190_charger.c > +++ b/drivers/power/supply/bq24190_charger.c > @@ -481,8 +481,10 @@ static ssize_t bq24190_sysfs_store(struct device *dev, > return ret; > > ret = pm_runtime_get_sync(bdi->dev); > - if (ret < 0) > + if (ret < 0) { > + pm_runtime_put_noidle(bdi->dev); > return ret; > + } > > ret = bq24190_write_mask(bdi, info->reg, info->mask, info->shift, v); > if (ret) > -- > 2.17.1 >
Hi, On Mon, May 25, 2020 at 01:09:00PM +0200, Rafael J. Wysocki wrote: > On Mon, May 25, 2020 at 1:05 PM Dinghao Liu <dinghao.liu@zju.edu.cn> wrote: > > > > pm_runtime_get_sync() increments the runtime PM usage counter even > > 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> > > Better now: > > Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Thanks, queued. -- Sebastian > > --- > > > > Changelog: > > > > v2: - Use pm_runtime_put_noidle() rather than > > pm_runtime_put_autosuspend(). > > --- > > drivers/power/supply/bq24190_charger.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/power/supply/bq24190_charger.c b/drivers/power/supply/bq24190_charger.c > > index 453d6332d43a..7b24c41a2137 100644 > > --- a/drivers/power/supply/bq24190_charger.c > > +++ b/drivers/power/supply/bq24190_charger.c > > @@ -481,8 +481,10 @@ static ssize_t bq24190_sysfs_store(struct device *dev, > > return ret; > > > > ret = pm_runtime_get_sync(bdi->dev); > > - if (ret < 0) > > + if (ret < 0) { > > + pm_runtime_put_noidle(bdi->dev); > > return ret; > > + } > > > > ret = bq24190_write_mask(bdi, info->reg, info->mask, info->shift, v); > > if (ret) > > -- > > 2.17.1 > >
diff --git a/drivers/power/supply/bq24190_charger.c b/drivers/power/supply/bq24190_charger.c index 453d6332d43a..7b24c41a2137 100644 --- a/drivers/power/supply/bq24190_charger.c +++ b/drivers/power/supply/bq24190_charger.c @@ -481,8 +481,10 @@ static ssize_t bq24190_sysfs_store(struct device *dev, return ret; ret = pm_runtime_get_sync(bdi->dev); - if (ret < 0) + if (ret < 0) { + pm_runtime_put_noidle(bdi->dev); return ret; + } ret = bq24190_write_mask(bdi, info->reg, info->mask, info->shift, v); if (ret)
pm_runtime_get_sync() increments the runtime PM usage counter even 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> --- Changelog: v2: - Use pm_runtime_put_noidle() rather than pm_runtime_put_autosuspend(). --- drivers/power/supply/bq24190_charger.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)