mfd: wm8994-core: Disable regulators before removing them

vireshk · Lee Jones · commit 3cfc43df7af0 · 2016-11-25T11:09:05.000Z
The order in which resources were freed in wm8994_device_exit() isn't
correct. The regulators are removed before they are disabled.

Fix it by reordering code a bit, which makes it exact opposite of
wm8994_device_init() as well.

Signed-off-by: Viresh Kumar &lt;viresh.kumar@linaro.org&gt;
Acked-by: Charles Keepax &lt;ckeepax@opensource.wolfsonmicro.com&gt;
Signed-off-by: Lee Jones &lt;lee.jones@linaro.org&gt;
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
@@ -604,10 +604,10 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
 static void wm8994_device_exit(struct wm8994 *wm8994)
 {
 	pm_runtime_disable(wm8994->dev);
-	mfd_remove_devices(wm8994->dev);
 	wm8994_irq_exit(wm8994);
 	regulator_bulk_disable(wm8994->num_supplies,
 			       wm8994->supplies);
+	mfd_remove_devices(wm8994->dev);
 }
 
 static const struct of_device_id wm8994_of_match[] = {

Original file line number	Diff line number	Diff line change
`@@ -604,10 +604,10 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)`
`604`	`604`	`static void wm8994_device_exit(struct wm8994 *wm8994)`
`605`	`605`	`{`
`606`	`606`	`pm_runtime_disable(wm8994->dev);`
`607`		`- mfd_remove_devices(wm8994->dev);`
`608`	`607`	`wm8994_irq_exit(wm8994);`
`609`	`608`	`regulator_bulk_disable(wm8994->num_supplies,`
`610`	`609`	`wm8994->supplies);`
	`610`	`+ mfd_remove_devices(wm8994->dev);`
`611`	`611`	`}`
`612`	`612`
`613`	`613`	`static const struct of_device_id wm8994_of_match[] = {`