[lvc-project] [PATCH v2] regulator: palmas: Check return value of palmas_smps_write()

[Aleksandrova Alyona]

palmas_set_mode_smps() updates the SMPS mode register when the rail is
enabled, but it ignores a possible error from palmas_smps_write().

If the register write fails, the function still reports success to the
caller even though the hardware mode has not been updated.

Return the error if palmas_smps_write() fails. Update current_reg_mode
and enable_val only after a successful register write so that the cached
driver state remains consistent with the hardware state.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: 51d3a0c999e1 ("regulator: palmas: preserve modes of rails during enable/disable")
Signed-off-by: Aleksandrova Alyona <aga at itb.spb.ru>
---
v2:
- Update current_reg_mode and enable_val only after a successful register
  write to keep the cached state consistent with the hardware state.

 drivers/regulator/palmas-regulator.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c
index 337dd614695e..8095ebabd671 100644
--- a/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@ -443,6 +443,7 @@ static int palmas_set_mode_smps(struct regulator_dev *dev, unsigned int mode)
 	struct palmas_pmic_driver_data *ddata = pmic->palmas->pmic_ddata;
 	struct palmas_regs_info *rinfo = &ddata->palmas_regs_info[id];
 	unsigned int reg;
+	unsigned int new_mode;
 	bool rail_enable = true;
 
 	ret = palmas_smps_read(pmic->palmas, rinfo->ctrl_addr, &reg);
@@ -468,12 +469,18 @@ static int palmas_set_mode_smps(struct regulator_dev *dev, unsigned int mode)
 		return -EINVAL;
 	}
 
-	pmic->current_reg_mode[id] = reg & PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK;
-	if (rail_enable)
-		palmas_smps_write(pmic->palmas, rinfo->ctrl_addr, reg);
+	new_mode = reg & PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK;
+
+	if (rail_enable) {
+		ret = palmas_smps_write(pmic->palmas, rinfo->ctrl_addr, reg);
+		if (ret)
+			return ret;
+	}
+
+	pmic->current_reg_mode[id] = new_mode;
 
 	/* Switch the enable value to ensure this is used for enable */
-	pmic->desc[id].enable_val = pmic->current_reg_mode[id];
+	pmic->desc[id].enable_val = new_mode;
 
 	return 0;
 }
-- 
2.26.2