From 336179eabeaa36ef9a9575cb0caa69f4701607dc Mon Sep 17 00:00:00 2001 From: Mike Rapoport Date: Tue, 25 Nov 2008 14:53:53 +0200 Subject: [PATCH] --- yaml --- r: 127855 b: refs/heads/master c: 74f544c1fc0339acf6f66ff438b8543b1f9faf10 h: refs/heads/master i: 127853: 8b433d46eefcda1a71cfc005ba7047fee8c2786a 127851: bf515b3de14c9c29a17eff57c1b28a34a3a00baa 127847: f409a3909c09c7e750b0a58381b5da1a0263d6ba 127839: e362ad5d9453bb0ee3e937b5740949da2241afbc v: v3 --- [refs] | 2 +- trunk/drivers/regulator/core.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index daa176a1c31e..09b06c065c54 100644 --- 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 index 9a5ff97d158d..895f73887cf0 100644 --- 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 = ®ulator_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)