commit 74f544c1fc0339acf6f66ff438b8543b1f9faf10
author Mike Rapoport <mike@compulab.co.il> Tue Nov 25 14:53:53 2008 +0200
committer Liam Girdwood <lrg@slimlogic.co.uk> Thu Jan 08 20:10:31 2009 +0000
tree 6e4a4739e78acde8534c23848970e694dc0b73a8
parent 961869048b61c853a17f35b98be91c5630a73906

regulator: move set_machine_constraints after regulator device initialization

Calling set_machine_constraints before regulator device initialization
causes crash when constraints have apply_uV set.

Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>

drivers/regulator/core.c

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 9a5ff97..895f738 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1858,11 +1858,6 @@
 			goto clean;
 	}
 
-	/* set regulator constraints */
-	ret = set_machine_constraints(rdev, &init_data->constraints);
-	if (ret < 0)
-		goto clean;
-
 	/* register with sysfs */
 	rdev->dev.class = &regulator_class;
 	rdev->dev.parent = dev;
@@ -1874,6 +1869,11 @@
 
 	dev_set_drvdata(&rdev->dev, rdev);
 
+	/* set regulator constraints */
+	ret = set_machine_constraints(rdev, &init_data->constraints);
+	if (ret < 0)
+		goto scrub;
+
 	/* add attributes supported by this regulator */
 	ret = add_regulator_attributes(rdev);
 	if (ret < 0)