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

regulator: tps65219: Fix is_enabled checking in tps65219_set_bypass

Testing .enable cannot tell if a regulator is enabled or not, check return
value of .is_enabled() instead.
Also remove unneeded ret variable.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Link: https://lore.kernel.org/r/20220919122353.384171-1-axel.lin@ingics.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Axel Lin and committed by
Mark Brown
947934e3 21c93a95

+2 -4
+2 -4
drivers/regulator/tps65219-regulator.c
··· 181 181 { 182 182 struct tps65219 *tps = rdev_get_drvdata(dev); 183 183 unsigned int rid = rdev_get_id(dev); 184 - int ret = 0; 185 184 186 - if (dev->desc->ops->enable) { 185 + if (dev->desc->ops->is_enabled(dev)) { 187 186 dev_err(tps->dev, 188 187 "%s LDO%d enabled, must be shut down to set bypass ", 189 188 __func__, rid); 190 189 return -EBUSY; 191 190 } 192 - ret = regulator_set_bypass_regmap(dev, enable); 193 - return ret; 191 + return regulator_set_bypass_regmap(dev, enable); 194 192 } 195 193 196 194 /* Operations permitted on BUCK1/2/3 */