Skip to content

Commit f4a1954

Browse files
mszyprowLee Jones
authored andcommitted
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 <[email protected]> Acked-by: Charles Keepax <[email protected]> Signed-off-by: Lee Jones <[email protected]>
1 parent d4f9b54 commit f4a1954

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/mfd/wm8994-core.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,7 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
584584
goto err_irq;
585585
}
586586

587+
pm_runtime_set_active(wm8994->dev);
587588
pm_runtime_enable(wm8994->dev);
588589
pm_runtime_idle(wm8994->dev);
589590

@@ -603,7 +604,9 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
603604

604605
static void wm8994_device_exit(struct wm8994 *wm8994)
605606
{
607+
pm_runtime_get_sync(wm8994->dev);
606608
pm_runtime_disable(wm8994->dev);
609+
pm_runtime_put_noidle(wm8994->dev);
607610
wm8994_irq_exit(wm8994);
608611
regulator_bulk_disable(wm8994->num_supplies, wm8994->supplies);
609612
regulator_bulk_free(wm8994->num_supplies, wm8994->supplies);

0 commit comments

Comments
 (0)