aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-02 12:44:42 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-02 12:44:42 -0800
commitebd65a5855a1ddb21706e630c9ba1b9e80c767f7 (patch)
tree605ae14abc99f287dccf0e0fd210dac1f7fdb0b7
parent6f9a76198f50c4dfe36c5be4081b72872cd644fe (diff)
parente8092da92e1fd38dc7c38a4eeae93eaa21764584 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: regulator: Initialise wm831x structure pointor for ISINK driver
-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 1d8d9879d3a..48857008758 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");