From 4dcf33d3a012bad90d1ee28cd5db267a9c0fea6f Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 14 May 2012 13:24:13 +0100
Subject: [PATCH] --- yaml --- r: 302286 b: refs/heads/master c:
 b68b45d77d7c23c6d92576d494796912883be4e1 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/regulator/wm8994-regulator.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 2272343d6e54..35b07d14e781 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1a868310e7024650918119d292129446b2f8336
+refs/heads/master: b68b45d77d7c23c6d92576d494796912883be4e1
diff --git a/trunk/drivers/regulator/wm8994-regulator.c b/trunk/drivers/regulator/wm8994-regulator.c
index 7c64ce599d2a..9a994316e63c 100644
--- a/trunk/drivers/regulator/wm8994-regulator.c
+++ b/trunk/drivers/regulator/wm8994-regulator.c
@@ -168,9 +168,6 @@ static __devinit int wm8994_ldo_probe(struct platform_device *pdev)
 
 	dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1);
 
-	if (!pdata)
-		return -ENODEV;
-
 	ldo = devm_kzalloc(&pdev->dev, sizeof(struct wm8994_ldo), GFP_KERNEL);
 	if (ldo == NULL) {
 		dev_err(&pdev->dev, "Unable to allocate private data\n");
@@ -192,9 +189,10 @@ static __devinit int wm8994_ldo_probe(struct platform_device *pdev)
 		ldo->is_enabled = true;
 
 	config.dev = wm8994->dev;
-	config.init_data = pdata->ldo[id].init_data;
 	config.driver_data = ldo;
 	config.regmap = wm8994->regmap;
+	if (pdata)
+		config.init_data = pdata->ldo[id].init_data;
 
 	ldo->regulator = regulator_register(&wm8994_ldo_desc[id], &config);
 	if (IS_ERR(ldo->regulator)) {