mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

power_supply: 88pm860x_charger: Decrement the power supply's device reference counter 

Use power_supply_put() to decrement the power supply's device reference
counter.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Reviewed-by: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
This commit is contained in:
Krzysztof Kozlowski 2015-03-12 08:44:17 +01:00 committed by Sebastian Reichel
parent 67273a1b42
commit 52016ac072
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/power/88pm860x_charger.c
View File

@ -298,13 +298,18 @@ static int set_charging_fsm(struct pm860x_charger_info *info)
return -EINVAL;
ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_VOLTAGE_NOW,
&data);
if (ret)
if (ret) {
power_supply_put(psy);
return ret;
}
vbatt = data.intval / 1000;
ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_PRESENT, &data);
if (ret)
if (ret) {
power_supply_put(psy);
return ret;
}
power_supply_put(psy);
mutex_lock(&info->lock);
info->present = data.intval;
@ -447,6 +452,7 @@ static irqreturn_t pm860x_temp_handler(int irq, void *data)
set_charging_fsm(info);
out:
power_supply_put(psy);
return IRQ_HANDLED;
}
@ -507,6 +513,7 @@ static irqreturn_t pm860x_done_handler(int irq, void *data)
out:
mutex_unlock(&info->lock);
power_supply_put(psy);
dev_dbg(info->dev, "%s, Allowed: %d\n", __func__, info->allowed);
set_charging_fsm(info);