diff options
| author | Axel Lin <axel.lin@ingics.com> | 2021-05-20 14:18:11 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-05-20 19:57:23 +0300 |
| commit | 855bfff9d623e7aff6556bfb6831d324dec8d96a (patch) | |
| tree | 80b077c53bd4812f5881ebee1c5eb8e5281a82e9 | |
| parent | 687c9e3b1a81d43b233482f781bd4e20561bc390 (diff) | |
| download | linux-855bfff9d623e7aff6556bfb6831d324dec8d96a.tar.xz | |
regulator: fixed: Ensure enable_counter is correct if reg_domain_disable fails
dev_pm_genpd_set_performance_state() may fail, so had better to check it's
return value before decreasing priv->enable_counter.
Fixes: bf3a28cf4241 ("regulator: fixed: support using power domain for enable/disable")
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Link: https://lore.kernel.org/r/20210520111811.1806293-1-axel.lin@ingics.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | drivers/regulator/fixed.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c index 02ad83153e19..34e255c235d4 100644 --- a/drivers/regulator/fixed.c +++ b/drivers/regulator/fixed.c @@ -88,10 +88,15 @@ static int reg_domain_disable(struct regulator_dev *rdev) { struct fixed_voltage_data *priv = rdev_get_drvdata(rdev); struct device *dev = rdev->dev.parent; + int ret; + + ret = dev_pm_genpd_set_performance_state(dev, 0); + if (ret) + return ret; priv->enable_counter--; - return dev_pm_genpd_set_performance_state(dev, 0); + return 0; } static int reg_is_enabled(struct regulator_dev *rdev) |