torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

regulator: max14577: Add error check for max14577_read_reg()

Browse Source 
The function max14577_reg_get_current_limit() calls the function
max14577_read_reg(), but does not check its return value. A proper
implementation can be found in max14577_get_online().

Add a error check for the max14577_read_reg() and return error code
if the function fails.

Fixes: b0902bbeb7 ("regulator: max14577: Add regulator driver for Maxim 14577")
Cc: stable@vger.kernel.org # v3.14
Signed-off-by: Wentao Liang <vulab@iscas.ac.cn>
Link: https://patch.msgid.link/20250526025627.407-1-vulab@iscas.ac.cn
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Wentao Liang 2025-05-26 10:56:27 +08:00 committed by Mark Brown
parent dcd7110213
commit 65271f868c
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/regulator/max14577-regulator.c
View File

@ -40,11 +40,14 @@ static int max14577_reg_get_current_limit(struct regulator_dev *rdev)
struct max14577 *max14577 = rdev_get_drvdata(rdev); struct max14577 *max14577 = rdev_get_drvdata(rdev);
const struct maxim_charger_current *limits = const struct maxim_charger_current *limits =
&maxim_charger_currents[max14577->dev_type]; &maxim_charger_currents[max14577->dev_type];
int ret;
if (rdev_get_id(rdev) != MAX14577_CHARGER) if (rdev_get_id(rdev) != MAX14577_CHARGER)
return -EINVAL; return -EINVAL;
max14577_read_reg(rmap, MAX14577_CHG_REG_CHG_CTRL4, &reg_data); ret = max14577_read_reg(rmap, MAX14577_CHG_REG_CHG_CTRL4, &reg_data);
if (ret < 0)
return ret;
if ((reg_data & CHGCTRL4_MBCICHWRCL_MASK) == 0) if ((reg_data & CHGCTRL4_MBCICHWRCL_MASK) == 0)
return limits->min; return limits->min;