---

yaml --- r: 127855 b: refs/heads/master c: 74f544c h: refs/heads/master i: 127853: 8b433d4 127851: bf515b3 127847: f409a39 127839: e362ad5 v: v3
git-mirror · Jan 8, 2009 · 336179e · 336179e
1 parent 235d24b
commit 336179e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 961869048b61c853a17f35b98be91c5630a73906
+refs/heads/master: 74f544c1fc0339acf6f66ff438b8543b1f9faf10
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
@@ -1858,11 +1858,6 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
 			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 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
 
 	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)