Commit f4a19540 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Lee Jones

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: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent d4f9b542
...@@ -584,6 +584,7 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq) ...@@ -584,6 +584,7 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
goto err_irq; goto err_irq;
} }
pm_runtime_set_active(wm8994->dev);
pm_runtime_enable(wm8994->dev); pm_runtime_enable(wm8994->dev);
pm_runtime_idle(wm8994->dev); pm_runtime_idle(wm8994->dev);
...@@ -603,7 +604,9 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq) ...@@ -603,7 +604,9 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
static void wm8994_device_exit(struct wm8994 *wm8994) static void wm8994_device_exit(struct wm8994 *wm8994)
{ {
pm_runtime_get_sync(wm8994->dev);
pm_runtime_disable(wm8994->dev); pm_runtime_disable(wm8994->dev);
pm_runtime_put_noidle(wm8994->dev);
wm8994_irq_exit(wm8994); wm8994_irq_exit(wm8994);
regulator_bulk_disable(wm8994->num_supplies, wm8994->supplies); regulator_bulk_disable(wm8994->num_supplies, wm8994->supplies);
regulator_bulk_free(wm8994->num_supplies, wm8994->supplies); regulator_bulk_free(wm8994->num_supplies, wm8994->supplies);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment