| Message ID | 20240717200333.56669-1-hdegoede@redhat.com |
|---|---|
| State | Accepted |
| Commit | b34ce4a59cfe9cd0d6f870e6408e8ec88a964585 |
| Headers | show |
| Series | [1/2] power: supply: axp288_charger: Fix constant_charge_voltage writes | expand |
On Wed, 17 Jul 2024 22:03:32 +0200, Hans de Goede wrote: > info->max_cv is in millivolts, divide the microvolt value being written > to constant_charge_voltage by 1000 *before* clamping it to info->max_cv. > > Before this fix the code always tried to set constant_charge_voltage > to max_cv / 1000 = 4 millivolt, which ends up in setting it to 4.1V > which is the lowest supported value. > > [...] Applied, thanks! [1/2] power: supply: axp288_charger: Fix constant_charge_voltage writes commit: b34ce4a59cfe9cd0d6f870e6408e8ec88a964585 [2/2] power: supply: axp288_charger: Round constant_charge_voltage writes down commit: 81af7f2342d162e24ac820c10e68684d9f927663 Best regards,
diff --git a/drivers/power/supply/axp288_charger.c b/drivers/power/supply/axp288_charger.c index b5903193e2f9..aea17289a178 100644 --- a/drivers/power/supply/axp288_charger.c +++ b/drivers/power/supply/axp288_charger.c @@ -337,8 +337,8 @@ static int axp288_charger_usb_set_property(struct power_supply *psy, } break; case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE: - scaled_val = min(val->intval, info->max_cv); - scaled_val = DIV_ROUND_CLOSEST(scaled_val, 1000); + scaled_val = DIV_ROUND_CLOSEST(val->intval, 1000); + scaled_val = min(scaled_val, info->max_cv); ret = axp288_charger_set_cv(info, scaled_val); if (ret < 0) { dev_warn(&info->pdev->dev, "set charge voltage failed\n");
info->max_cv is in millivolts, divide the microvolt value being written to constant_charge_voltage by 1000 *before* clamping it to info->max_cv. Before this fix the code always tried to set constant_charge_voltage to max_cv / 1000 = 4 millivolt, which ends up in setting it to 4.1V which is the lowest supported value. Fixes: 843735b788a4 ("power: axp288_charger: axp288 charger driver") Cc: stable@vger.kernel.org Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/power/supply/axp288_charger.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)