diff options
| author | Greg Kroah-Hartman <[email protected]> | 2021-06-14 07:14:43 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2021-06-14 07:14:43 +0000 |
| commit | 99289bf1a76c0aea6ac0f77335b8c9bdca16aac7 (patch) | |
| tree | 69b9484abfd6014154b925fdc0733438ffdf923f /drivers/regulator/fixed.c | |
| parent | vt: vt_kern.h, remove the repeated declaration (diff) | |
| parent | Linux 5.13-rc6 (diff) | |
| download | kernel-99289bf1a76c0aea6ac0f77335b8c9bdca16aac7.tar.gz kernel-99289bf1a76c0aea6ac0f77335b8c9bdca16aac7.zip | |
Merge tag 'v5.13-rc6' into tty-next
We want the tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'drivers/regulator/fixed.c')
| -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) |