lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 232/717] power: supply: bq24190_charger: fix reference leak
    Date
    From: Zhang Qilong <zhangqilong3@huawei.com>

    [ 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: f385e6e2a1532 ("power: bq24190_charger: Use PM runtime autosuspend")
    Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
    Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/power/supply/bq24190_charger.c | 20 +++++++++++++++-----
    1 file changed, 15 insertions(+), 5 deletions(-)

    diff --git a/drivers/power/supply/bq24190_charger.c b/drivers/power/supply/bq24190_charger.c
    index d14186525e1e9..845af0f44c022 100644
    --- a/drivers/power/supply/bq24190_charger.c
    +++ b/drivers/power/supply/bq24190_charger.c
    @@ -448,8 +448,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)
    @@ -1077,8 +1079,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:
    @@ -1149,8 +1153,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:
    @@ -1410,8 +1416,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:
    @@ -1456,8 +1464,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:
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 16:09    [W:6.368 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site