aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2008-09-09 11:21:18 -0400
committerLiam Girdwood <lrg@slimlogic.co.uk>2008-10-13 16:51:51 -0400
commit46fabe1edd44a8893d88d7982f88d01ccf77f0bb (patch)
tree6c01ae79e6ec7d84b839464015919cca658a5734
parent3de89609a82aa68f543cba263eb28725e0fde511 (diff)
regulator: check for init_data on registration
Since it is now mandatory to supply constraints via init_data on device registration check for that when registering, saving us from oopsing later on. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
-rw-r--r--drivers/regulator/core.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 84202eaace57..65e07b941a36 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1691,6 +1691,9 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
1691 !regulator_desc->type == REGULATOR_CURRENT) 1691 !regulator_desc->type == REGULATOR_CURRENT)
1692 return ERR_PTR(-EINVAL); 1692 return ERR_PTR(-EINVAL);
1693 1693
1694 if (!init_data)
1695 return ERR_PTR(-EINVAL);
1696
1694 rdev = kzalloc(sizeof(struct regulator_dev), GFP_KERNEL); 1697 rdev = kzalloc(sizeof(struct regulator_dev), GFP_KERNEL);
1695 if (rdev == NULL) 1698 if (rdev == NULL)
1696 return ERR_PTR(-ENOMEM); 1699 return ERR_PTR(-ENOMEM);