---

yaml --- r: 323313 b: refs/heads/master c: 52b84da h: refs/heads/master i: 323311: 4a521fa v: v3
git-mirror · Sep 8, 2012 · 66c5949 · 66c5949
1 parent b76fa93
commit 66c5949
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b5a24a01df12fbfa3e702ad7efae27bcb852e33
+refs/heads/master: 52b84dac436a681fa51dad2b9e57b6ea50309cbd
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
@@ -3202,8 +3202,10 @@ regulator_register(const struct regulator_desc *regulator_desc,
 	rdev->desc = regulator_desc;
 	if (config->regmap)
 		rdev->regmap = config->regmap;
-	else
+	else if (dev_get_regmap(dev, NULL))
 		rdev->regmap = dev_get_regmap(dev, NULL);
+	else if (dev->parent)
+		rdev->regmap = dev_get_regmap(dev->parent, NULL);
 	INIT_LIST_HEAD(&rdev->consumer_list);
 	INIT_LIST_HEAD(&rdev->list);
 	BLOCKING_INIT_NOTIFIER_HEAD(&rdev->notifier);