From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 396411B4C31; Thu, 15 Aug 2024 14:02:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723730543; cv=none; b=R5QEFytZwGzctVV3Ge/Nwl8rdVdkWN9FiUECr2T+pVe0HBZYvgmOm4VPPR8c1kJdZ2TzcMyL7cs15SYMiXgkS8tOqFdxZ3FhmP/f8mW5uzdahFUJ3gbTl1JdOn/4cddmQ8iitR8GaQWAkjpBA+eI7gn/6P7EJqVw1suRg2XcC+E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723730543; c=relaxed/simple; bh=8g7rTr4taSEugZP9giu426HbT5YqcR8ASFg/PWOkalM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZOy3ox20a0GgN24wvBBLfWpS7chg0gI1kmUllClGnfWlK7DVhlRBXQns4AMTPSjrKbQID/PDai9QdtgZUNZZxEkvxP6Zk34vW7J/0hPwnAPYlEIhWs0M5omBcvSHIiqZetGQsO/5Nq5Jh0kl+OEHV491lKw38Us4vEhVCPopMEA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=XespUck+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="XespUck+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B00ACC4AF0A; Thu, 15 Aug 2024 14:02:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723730543; bh=8g7rTr4taSEugZP9giu426HbT5YqcR8ASFg/PWOkalM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XespUck+rx3ACz35CPpdC6CpC3q85WbL7w1H+YuvEPJEGGmS7FZ81z9+g3r6S+qTg T49i7fYXuhv9/c3TJ0lbzjLoTmlp7jfg2ase5t5CCgPCMr5OD19BHc72OUUkIMi6Oz 22O1fSgkLzj2tn39/wExDen4y6DsOmHfypcpkmkE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Hans de Goede , Sebastian Reichel Subject: [PATCH 5.15 442/484] power: supply: axp288_charger: Fix constant_charge_voltage writes Date: Thu, 15 Aug 2024 15:25:00 +0200 Message-ID: <20240815131958.532288470@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240815131941.255804951@linuxfoundation.org> References: <20240815131941.255804951@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hans de Goede commit b34ce4a59cfe9cd0d6f870e6408e8ec88a964585 upstream. 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 Link: https://lore.kernel.org/r/20240717200333.56669-1-hdegoede@redhat.com Signed-off-by: Sebastian Reichel Signed-off-by: Greg Kroah-Hartman --- drivers/power/supply/axp288_charger.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/power/supply/axp288_charger.c +++ b/drivers/power/supply/axp288_charger.c @@ -371,8 +371,8 @@ static int axp288_charger_usb_set_proper dev_warn(&info->pdev->dev, "set charge current failed\n"); 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");