Commit d7582bb0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v6.16-merge-window' of... 

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()
parents 8a2ba6f8 65271f86

drivers/regulator/max14577-regulator.c

+4 −1
Original line number Diff line number Diff line
@@ -40,11 +40,14 @@ static int max14577_reg_get_current_limit(struct regulator_dev *rdev) 
	struct max14577 *max14577 = rdev_get_drvdata(rdev);

	const struct maxim_charger_current *limits =

		&maxim_charger_currents[max14577->dev_type];

	int ret;



	if (rdev_get_id(rdev) != MAX14577_CHARGER)

		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)

		return limits->min;