diff options
Diffstat (limited to 'drivers/power/88pm860x_charger.c')
-rw-r--r-- | drivers/power/88pm860x_charger.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/power/88pm860x_charger.c b/drivers/power/88pm860x_charger.c index bf822aa00c14..0e448c68c02b 100644 --- a/drivers/power/88pm860x_charger.c +++ b/drivers/power/88pm860x_charger.c | |||
@@ -495,7 +495,7 @@ static irqreturn_t pm860x_done_handler(int irq, void *data) | |||
495 | ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_VOLTAGE_NOW, | 495 | ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_VOLTAGE_NOW, |
496 | &val); | 496 | &val); |
497 | if (ret) | 497 | if (ret) |
498 | goto out; | 498 | goto out_psy_put; |
499 | vbatt = val.intval / 1000; | 499 | vbatt = val.intval / 1000; |
500 | /* | 500 | /* |
501 | * CHG_DONE interrupt is faster than CHG_DET interrupt when | 501 | * CHG_DONE interrupt is faster than CHG_DET interrupt when |
@@ -506,14 +506,15 @@ static irqreturn_t pm860x_done_handler(int irq, void *data) | |||
506 | */ | 506 | */ |
507 | ret = pm860x_reg_read(info->i2c, PM8607_STATUS_2); | 507 | ret = pm860x_reg_read(info->i2c, PM8607_STATUS_2); |
508 | if (ret < 0) | 508 | if (ret < 0) |
509 | goto out; | 509 | goto out_psy_put; |
510 | if (vbatt > CHARGE_THRESHOLD && ret & STATUS2_CHG) | 510 | if (vbatt > CHARGE_THRESHOLD && ret & STATUS2_CHG) |
511 | power_supply_set_property(psy, POWER_SUPPLY_PROP_CHARGE_FULL, | 511 | power_supply_set_property(psy, POWER_SUPPLY_PROP_CHARGE_FULL, |
512 | &val); | 512 | &val); |
513 | 513 | ||
514 | out_psy_put: | ||
515 | power_supply_put(psy); | ||
514 | out: | 516 | out: |
515 | mutex_unlock(&info->lock); | 517 | mutex_unlock(&info->lock); |
516 | power_supply_put(psy); | ||
517 | dev_dbg(info->dev, "%s, Allowed: %d\n", __func__, info->allowed); | 518 | dev_dbg(info->dev, "%s, Allowed: %d\n", __func__, info->allowed); |
518 | set_charging_fsm(info); | 519 | set_charging_fsm(info); |
519 | 520 | ||