Merge tag 'regulator-fix-v6.16-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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()

Linus Torvalds 10 months ago d7582bb0 8a2ba6f8

+4 -1

1 changed file

expand all

drivers

regulator

max14577-regulator.c

+4 -1

drivers/regulator/max14577-regulator.c

··· 40 40 struct max14577 *max14577 = rdev_get_drvdata(rdev); 41 41 const struct maxim_charger_current *limits = 42 42 &maxim_charger_currents[max14577->dev_type]; 43 + int ret; 43 44 44 45 if (rdev_get_id(rdev) != MAX14577_CHARGER) 45 46 return -EINVAL; 46 47 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; 48 51 49 52 if ((reg_data & CHGCTRL4_MBCICHWRCL_MASK) == 0) 50 53 return limits->min;