aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorFabio Baltieri <fabio.baltieri@linaro.org>2013-04-26 08:17:17 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2013-05-16 18:42:30 -0400
commit9f7af61a93fc96ae7e55d6a292f5cc7decba5ad2 (patch)
tree3b1dc590ae0caf0fd1781034efd517acb095e78b /drivers/mfd
parent3d2088a14d949651f8b799d425ecbd684e35348b (diff)
mfd: ab8500-sysctrl: Set sysctrl_dev during probe
The driver requires sysctrl_dev to be set at probe, as it's used by other driver functions. This was dropped by mistake in: 2377e52 mfd: ab8500-sysctrl: Error check clean up making all driver functions fail. Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/ab8500-sysctrl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mfd/ab8500-sysctrl.c b/drivers/mfd/ab8500-sysctrl.c
index 640495e07144..b851692b0755 100644
--- a/drivers/mfd/ab8500-sysctrl.c
+++ b/drivers/mfd/ab8500-sysctrl.c
@@ -191,6 +191,8 @@ static int ab8500_sysctrl_probe(struct platform_device *pdev)
191 if (!(plat && plat->sysctrl)) 191 if (!(plat && plat->sysctrl))
192 return -EINVAL; 192 return -EINVAL;
193 193
194 sysctrl_dev = &pdev->dev;
195
194 if (plat->pm_power_off) 196 if (plat->pm_power_off)
195 pm_power_off = ab8500_power_off; 197 pm_power_off = ab8500_power_off;
196 198