github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-29 17:43:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

regulator: Fix for v6.16

Browse Source 
A very minor fix that came in during the merge window, checking for I/O
 errors in the MAX14577 driver.
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmhBmiMACgkQJNaLcl1U
 h9A5sAf9F/hOszrNv4Css2Md5h2nYNg+GY/cWOK4wIaVBxXG0OSqJZMVoqyYn+tj
 Wb9OJf11CSoC7OSfG/pgN6W61leWmZ97HCs6tAkkuCm9DdklHB7i5yz2oedliG7e
 fx2a6FYsIzGMN5i/+57bQxmNjIiHgioK1A+s2pDru6TyHucTDdwUBPWIemnjoCEV
 mpSdlmSxIhyoWapE+Ur4L5lHBATWKl98TjxO6lzIaqJmFe16jZpwZY8sXY0q9+qV
 Lg+W+EAFs6pna6l0FY6lnriAlUSBJDMgTa0aM3cpvX9RwBnH9Z+V4ebjkSXJ8CJA
 sXFWoQvdPGdt/Dxez5qnldpTioldGw==
 =m+cK
 -----END PGP SIGNATURE-----

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()
This commit is contained in:
Linus Torvalds 2025-06-06 13:20:26 -07:00
commit d7582bb0a4
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);
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;