summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-11-30 15:01:56 +0100
committerLiam Girdwood <lrg@slimlogic.co.uk>2009-12-02 20:37:16 +0100
commite8092da92e1fd38dc7c38a4eeae93eaa21764584 (patch)
tree659595a45e74ed41493e0aacdd6a06010fbefd15 /drivers/regulator
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 (diff)
downloadlinux-e8092da92e1fd38dc7c38a4eeae93eaa21764584.tar.xz
linux-e8092da92e1fd38dc7c38a4eeae93eaa21764584.zip
regulator: Initialise wm831x structure pointor for ISINK driver
The version that made it into mainline missed the initialisation of the chip handle. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/wm831x-isink.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/regulator/wm831x-isink.c b/drivers/regulator/wm831x-isink.c
index 1d8d9879d3a1..48857008758c 100644
--- a/drivers/regulator/wm831x-isink.c
+++ b/drivers/regulator/wm831x-isink.c
@@ -167,6 +167,8 @@ static __devinit int wm831x_isink_probe(struct platform_device *pdev)
return -ENOMEM;
}
+ isink->wm831x = wm831x;
+
res = platform_get_resource(pdev, IORESOURCE_IO, 0);
if (res == NULL) {
dev_err(&pdev->dev, "No I/O resource\n");