From a7b16aed16b0c40d1b1536ebf5d2833db8ee4bba Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Wed, 30 Jan 2013 20:52:49 +0800 Subject: [PATCH] --- yaml --- r: 350448 b: refs/heads/master c: ee70b258498174ba50b346960763203b7cba9d4a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/max8997.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b29b885ac55a..03ca53c2039e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c92f5dd2c42fa61e0ef810fad4584b184ea2d50e +refs/heads/master: ee70b258498174ba50b346960763203b7cba9d4a diff --git a/trunk/drivers/regulator/max8997.c b/trunk/drivers/regulator/max8997.c index 5abd0d3288f0..93269215d981 100644 --- a/trunk/drivers/regulator/max8997.c +++ b/trunk/drivers/regulator/max8997.c @@ -973,9 +973,7 @@ static int max8997_pmic_dt_parse_pdata(struct platform_device *pdev, } /* count the number of regulators to be supported in pmic */ - pdata->num_regulators = 0; - for_each_child_of_node(regulators_np, reg_np) - pdata->num_regulators++; + pdata->num_regulators = of_get_child_count(regulators_np); rdata = devm_kzalloc(&pdev->dev, sizeof(*rdata) * pdata->num_regulators, GFP_KERNEL);