From 947934e389f716d505a656d04388b2ecbe43281d Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 19 Sep 2022 20:23:53 +0800 Subject: 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 Link: https://lore.kernel.org/r/20220919122353.384171-1-axel.lin@ingics.com Signed-off-by: Mark Brown --- drivers/regulator/tps65219-regulator.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'drivers/regulator/tps65219-regulator.c') diff --git a/drivers/regulator/tps65219-regulator.c b/drivers/regulator/tps65219-regulator.c index b198dcc60bc7..c484c943e467 100644 --- a/drivers/regulator/tps65219-regulator.c +++ b/drivers/regulator/tps65219-regulator.c @@ -181,16 +181,14 @@ static int tps65219_set_bypass(struct regulator_dev *dev, bool enable) { struct tps65219 *tps = rdev_get_drvdata(dev); unsigned int rid = rdev_get_id(dev); - int ret = 0; - if (dev->desc->ops->enable) { + if (dev->desc->ops->is_enabled(dev)) { dev_err(tps->dev, "%s LDO%d enabled, must be shut down to set bypass ", __func__, rid); return -EBUSY; } - ret = regulator_set_bypass_regmap(dev, enable); - return ret; + return regulator_set_bypass_regmap(dev, enable); } /* Operations permitted on BUCK1/2/3 */ -- cgit v1.2.3