summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2016-09-16 05:26:59 +0200
committerLee Jones <lee.jones@linaro.org>2016-11-29 09:21:21 +0100
commitbb63f7d33d35b17faac72ea63e03c57396766eee (patch)
tree59d181c5d86e1c2684ad6eb8b4bf1125852d29f4 /drivers/mfd
parentmfd: wm8994-core: Don't split lines unnecessarily (diff)
downloadlinux-bb63f7d33d35b17faac72ea63e03c57396766eee.tar.xz
linux-bb63f7d33d35b17faac72ea63e03c57396766eee.zip
mfd: wm8994-core: Disable regulators before removing them
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 <viresh.kumar@linaro.org> Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/wm8994-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index 1990b2c90732..95e6bc55adbb 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -603,9 +603,9 @@ err:
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[] = {