From 9d6c134395cd5e73ec3b367e9cf525cb247c11e2 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 9 Sep 2008 16:21:18 +0100
Subject: [PATCH] --- yaml --- r: 114274 b: refs/heads/master c:
 46fabe1edd44a8893d88d7982f88d01ccf77f0bb h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 697f4366ecfb..d8824de76b74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3de89609a82aa68f543cba263eb28725e0fde511
+refs/heads/master: 46fabe1edd44a8893d88d7982f88d01ccf77f0bb
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index 84202eaace57..65e07b941a36 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -1691,6 +1691,9 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
 	    !regulator_desc->type == REGULATOR_CURRENT)
 		return ERR_PTR(-EINVAL);
 
+	if (!init_data)
+		return ERR_PTR(-EINVAL);
+
 	rdev = kzalloc(sizeof(struct regulator_dev), GFP_KERNEL);
 	if (rdev == NULL)
 		return ERR_PTR(-ENOMEM);