diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2020-04-27 09:48:30 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2020-05-26 10:51:20 +0100 |
| commit | f4a1954036c1a256e89fb087eb39cb719336e7c4 (patch) | |
| tree | 037046b5616e53dc83ddaf506a85600f4579d40b | |
| parent | d4f9b5428b53dd67f49ee8deed8d4366ed6b1933 (diff) | |
| download | linux-stable-f4a1954036c1a256e89fb087eb39cb719336e7c4.tar.gz linux-stable-f4a1954036c1a256e89fb087eb39cb719336e7c4.tar.bz2 linux-stable-f4a1954036c1a256e89fb087eb39cb719336e7c4.zip | |
mfd: wm8994: Fix unbalanced calls to regulator_bulk_disable()
When runtime PM is enabled, regulators are being controlled by the
driver's suspend and resume callbacks. They are also unconditionally
enabled at driver's probe(), and disabled in remove() functions. Add
more calls to runtime PM framework to ensure that the device's runtime
PM state matches the regulators state:
1. at the end of probe() function: set runtime PM state to active, so
there will be no spurious call to resume();
2. in remove(), ensure that resume() is called before disabling runtime PM
management and unconditionally disabling the regulators.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
| -rw-r--r-- | drivers/mfd/wm8994-core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c index 737dede4a95c..69d973ec42bf 100644 --- a/drivers/mfd/wm8994-core.c +++ b/drivers/mfd/wm8994-core.c @@ -584,6 +584,7 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq) goto err_irq; } + pm_runtime_set_active(wm8994->dev); pm_runtime_enable(wm8994->dev); pm_runtime_idle(wm8994->dev); @@ -603,7 +604,9 @@ err: static void wm8994_device_exit(struct wm8994 *wm8994) { + pm_runtime_get_sync(wm8994->dev); pm_runtime_disable(wm8994->dev); + pm_runtime_put_noidle(wm8994->dev); wm8994_irq_exit(wm8994); regulator_bulk_disable(wm8994->num_supplies, wm8994->supplies); regulator_bulk_free(wm8994->num_supplies, wm8994->supplies); |