* [PATCH] regulator: core: fix rdev->regmap NULL pointer
@ 2012-09-07 15:15 AnilKumar Ch
2012-09-08 0:57 ` Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: AnilKumar Ch @ 2012-09-07 15:15 UTC (permalink / raw)
To: broonie, linux-kernel; +Cc: axel.lin, lrg, AnilKumar Ch
Fixes rdev->regmap NULL pointer if regmap for regulator device
is NULL. If it is NULL then get regmap for regulator device
from its parent (MFD).
Signed-off-by: AnilKumar Ch <anilkumar@ti.com>
---
drivers/regulator/core.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 4838531..7d85402 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -3189,8 +3189,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);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] regulator: core: fix rdev->regmap NULL pointer
2012-09-07 15:15 [PATCH] regulator: core: fix rdev->regmap NULL pointer AnilKumar Ch
@ 2012-09-08 0:57 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2012-09-08 0:57 UTC (permalink / raw)
To: AnilKumar Ch; +Cc: linux-kernel, axel.lin, lrg
On Fri, Sep 07, 2012 at 08:45:05PM +0530, AnilKumar Ch wrote:
> Fixes rdev->regmap NULL pointer if regmap for regulator device
> is NULL. If it is NULL then get regmap for regulator device
> from its parent (MFD).
>
> Signed-off-by: AnilKumar Ch <anilkumar@ti.com>
Applied with a rewritten commit message - this is adding a new feature,
not fixing a problem (devices can always explicitly specify a regmap,
this is just adding a new default option). Thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-09-08 0:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-07 15:15 [PATCH] regulator: core: fix rdev->regmap NULL pointer AnilKumar Ch
2012-09-08 0:57 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox