From dea0a5410848c3557d55c3a039b81121b3cb43ca Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 11 Apr 2012 10:19:12 +0100
Subject: [PATCH] --- yaml --- r: 302198 b: refs/heads/master c:
 32c8fad438200b523ec44a49b40cb8ffdf715f7c h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/regulator/core.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 01e8aef35c97..08842427db8c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9eb0c4218aa444f863e7f54909351d5b4f0fac06
+refs/heads/master: 32c8fad438200b523ec44a49b40cb8ffdf715f7c
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index 4bb1f8456123..7943fd64988d 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -2833,13 +2833,15 @@ regulator_register(const struct regulator_desc *regulator_desc,
 	const struct regulator_init_data *init_data;
 	static atomic_t regulator_no = ATOMIC_INIT(0);
 	struct regulator_dev *rdev;
-	struct device *dev = config->dev;
+	struct device *dev;
 	int ret, i;
 	const char *supply = NULL;
 
 	if (regulator_desc == NULL || config == NULL)
 		return ERR_PTR(-EINVAL);
 
+	dev = config->dev;
+
 	if (regulator_desc->name == NULL || regulator_desc->ops == NULL)
 		return ERR_PTR(-EINVAL);