projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
687c9e3
)
regulator: fixed: Ensure enable_counter is correct if reg_domain_disable fails
author
Axel Lin
<axel.lin@ingics.com>
Thu, 20 May 2021 11:18:11 +0000
(19:18 +0800)
committer
Mark Brown
<broonie@kernel.org>
Thu, 20 May 2021 16:57:23 +0000
(17:57 +0100)
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>
drivers/regulator/fixed.c
patch
|
blob
|
history
diff --git
a/drivers/regulator/fixed.c
b/drivers/regulator/fixed.c
index
02ad831
..
34e255c
100644
(file)
--- 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)