From 66c5949eae068afd07cb27aefe7ca1eeaec56d8b Mon Sep 17 00:00:00 2001 From: AnilKumar Ch Date: Fri, 7 Sep 2012 20:45:05 +0530 Subject: [PATCH] --- yaml --- r: 323313 b: refs/heads/master c: 52b84dac436a681fa51dad2b9e57b6ea50309cbd h: refs/heads/master i: 323311: 4a521fa48a9a27441ddde8c44991aa0462e2799c v: v3 --- [refs] | 2 +- trunk/drivers/regulator/core.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index be68152ce6ee..8e58fff4776e 100644 --- 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 index ed376d9f525d..03fad8153476 100644 --- 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);