Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 281be921 authored by Zhang Qilong's avatar Zhang Qilong Committed by Greg Kroah-Hartman
Browse files

power: supply: bq24190_charger: fix reference leak 



[ Upstream commit b2f6cb78eaa1cad57dd3fe11d0458cd4fae9a584 ]

pm_runtime_get_sync will increment pm usage counter even it
failed. Forgetting to call pm_runtime_put_noidle will result
in reference leak in callers(bq24190_sysfs_show,
bq24190_charger_get_property, bq24190_charger_set_property,
bq24190_battery_get_property, bq24190_battery_set_property),
so we should fix it.

Fixes: f385e6e2 ("power: bq24190_charger: Use PM runtime autosuspend")
Signed-off-by: default avatarZhang Qilong <zhangqilong3@huawei.com>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3e17354a

drivers/power/supply/bq24190_charger.c

+15 −5
Original line number Diff line number Diff line
@@ -446,8 +446,10 @@ static ssize_t bq24190_sysfs_show(struct device *dev, 
		return -EINVAL;



	ret = pm_runtime_get_sync(bdi->dev);

	if (ret < 0)

	if (ret < 0) {

		pm_runtime_put_noidle(bdi->dev);

		return ret;

	}



	ret = bq24190_read_mask(bdi, info->reg, info->mask, info->shift, &v);

	if (ret)
@@ -1092,8 +1094,10 @@ static int bq24190_charger_get_property(struct power_supply *psy, 
	dev_dbg(bdi->dev, "prop: %d\n", psp);



	ret = pm_runtime_get_sync(bdi->dev);

	if (ret < 0)

	if (ret < 0) {

		pm_runtime_put_noidle(bdi->dev);

		return ret;

	}



	switch (psp) {

	case POWER_SUPPLY_PROP_CHARGE_TYPE:
@@ -1164,8 +1168,10 @@ static int bq24190_charger_set_property(struct power_supply *psy, 
	dev_dbg(bdi->dev, "prop: %d\n", psp);



	ret = pm_runtime_get_sync(bdi->dev);

	if (ret < 0)

	if (ret < 0) {

		pm_runtime_put_noidle(bdi->dev);

		return ret;

	}



	switch (psp) {

	case POWER_SUPPLY_PROP_ONLINE:
@@ -1425,8 +1431,10 @@ static int bq24190_battery_get_property(struct power_supply *psy, 
	dev_dbg(bdi->dev, "prop: %d\n", psp);



	ret = pm_runtime_get_sync(bdi->dev);

	if (ret < 0)

	if (ret < 0) {

		pm_runtime_put_noidle(bdi->dev);

		return ret;

	}



	switch (psp) {

	case POWER_SUPPLY_PROP_STATUS:
@@ -1471,8 +1479,10 @@ static int bq24190_battery_set_property(struct power_supply *psy, 
	dev_dbg(bdi->dev, "prop: %d\n", psp);



	ret = pm_runtime_get_sync(bdi->dev);

	if (ret < 0)

	if (ret < 0) {

		pm_runtime_put_noidle(bdi->dev);

		return ret;

	}



	switch (psp) {

	case POWER_SUPPLY_PROP_ONLINE: