Skip to content

Commit d7582bb

Browse files
committed
Merge tag 'regulator-fix-v6.16-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fix from Mark Brown: "A very minor fix that came in during the merge window, checking for I/O errors in the MAX14577 driver" * tag 'regulator-fix-v6.16-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: max14577: Add error check for max14577_read_reg()
2 parents 8a2ba6f + 65271f8 commit d7582bb

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/regulator/max14577-regulator.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,14 @@ static int max14577_reg_get_current_limit(struct regulator_dev *rdev)
4040
struct max14577 *max14577 = rdev_get_drvdata(rdev);
4141
const struct maxim_charger_current *limits =
4242
&maxim_charger_currents[max14577->dev_type];
43+
int ret;
4344

4445
if (rdev_get_id(rdev) != MAX14577_CHARGER)
4546
return -EINVAL;
4647

47-
max14577_read_reg(rmap, MAX14577_CHG_REG_CHG_CTRL4, &reg_data);
48+
ret = max14577_read_reg(rmap, MAX14577_CHG_REG_CHG_CTRL4, &reg_data);
49+
if (ret < 0)
50+
return ret;
4851

4952
if ((reg_data & CHGCTRL4_MBCICHWRCL_MASK) == 0)
5053
return limits->min;

0 commit comments

Comments
 (0)