Messages in this thread Patch in this message |  | | Date | Tue, 25 Feb 2014 14:42:59 +0530 | Subject | Re: [PATCH 1/1] regulator: mc13xxx: check if DT is enabled | From | Sachin Kamat <> |
| |
On 25 February 2014 14:17, Philippe Rétornaz <philippe.retornaz@epfl.ch> wrote: > This fix a regression on non-DT board booted with a DT enabled kernel > > Signed-off-by: Philippe Rétornaz <philippe.retornaz@epfl.ch> > --- > drivers/regulator/mc13xxx-regulator-core.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/regulator/mc13xxx-regulator-core.c b/drivers/regulator/mc13xxx-regulator-core.c > index 4498a3f..a10c999 100644 > --- a/drivers/regulator/mc13xxx-regulator-core.c > +++ b/drivers/regulator/mc13xxx-regulator-core.c > @@ -167,6 +167,9 @@ int mc13xxx_get_num_regulators_dt(struct platform_device *pdev) > struct device_node *parent; > int num; > > + if(!pdev->dev.parent->of_node) > + return -ENODEV; > + > of_node_get(pdev->dev.parent->of_node); > parent = of_get_child_by_name(pdev->dev.parent->of_node, "regulators"); > if (!parent) > @@ -187,6 +190,9 @@ struct mc13xxx_regulator_init_data *mc13xxx_parse_regulators_dt( > struct device_node *parent, *child; > int i, parsed = 0; > > + if(!pdev->dev.parent->of_node) > + return NULL; > + > of_node_get(pdev->dev.parent->of_node); > parent = of_get_child_by_name(pdev->dev.parent->of_node, "regulators"); > if (!parent) > -- > 1.7.9.5 >
Thanks for the patch. I was about to send a similar patch which also does a little more cleanup. If you could test it in DT and non-DT modes that would be great. I attach the diff below. You can even fold it into your patch if you wish.
------------------ diff --git a/drivers/regulator/mc13xxx-regulator-core.c b/drivers/regulator/mc13xxx-regulator-core.c index 4498a3f0733d..bf75fcabfa3c 100644 --- a/drivers/regulator/mc13xxx-regulator-core.c +++ b/drivers/regulator/mc13xxx-regulator-core.c @@ -167,8 +167,10 @@ int mc13xxx_get_num_regulators_dt(struct platform_device *pdev) struct device_node *parent; int num;
- of_node_get(pdev->dev.parent->of_node); - parent = of_get_child_by_name(pdev->dev.parent->of_node, "regulators"); + if (!pdev->dev.of_node) + return -ENODEV; + + parent = of_get_child_by_name(pdev->dev.of_node, "regulators"); if (!parent) return -ENODEV;
@@ -187,8 +189,10 @@ struct mc13xxx_regulator_init_data *mc13xxx_parse_regulators_dt( struct device_node *parent, *child; int i, parsed = 0;
- of_node_get(pdev->dev.parent->of_node); - parent = of_get_child_by_name(pdev->dev.parent->of_node, "regulators"); + if (!pdev->dev.of_node) + return NULL; + + parent = of_get_child_by_name(pdev->dev.of_node, "regulators"); if (!parent) return NULL;
-- With warm regards, Sachin -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
|  |