| Message ID | 20180305091722.22246-1-jeffy.chen@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Jeffy, On 2018/3/5 17:17, Jeffy Chen wrote: > The of_count_phandle_with_args() can fail and return error(for example, > rk3399 pd_vio doesn't have clocks). That would break the pd probe. > > Add a sanity check on pd->num_clks to avoid that. > > Fixes: 65084121d59d ("soc: rockchip: power-domain: use clk_bulk APIs") > Reported-by: Shawn Lin <shawn.lin@rock-chips.com> > Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> Tested-by: Shawn Lin <shawn.lin@rock-chips.com>
Am Montag, 5. März 2018, 10:17:22 CET schrieb Jeffy Chen: > The of_count_phandle_with_args() can fail and return error(for example, > rk3399 pd_vio doesn't have clocks). That would break the pd probe. > > Add a sanity check on pd->num_clks to avoid that. > > Fixes: 65084121d59d ("soc: rockchip: power-domain: use clk_bulk APIs") > Reported-by: Shawn Lin <shawn.lin@rock-chips.com> > Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> applied for 4.17 Thanks Heiko
diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c index ad96ddeaeb78..fd58fd475950 100644 --- a/drivers/soc/rockchip/pm_domains.c +++ b/drivers/soc/rockchip/pm_domains.c @@ -402,11 +402,16 @@ static int rockchip_pm_add_one_domain(struct rockchip_pmu *pmu, pd->num_clks = of_count_phandle_with_args(node, "clocks", "#clock-cells"); - - pd->clks = devm_kcalloc(pmu->dev, pd->num_clks, sizeof(*pd->clks), - GFP_KERNEL); - if (!pd->clks) - return -ENOMEM; + if (pd->num_clks > 0) { + pd->clks = devm_kcalloc(pmu->dev, pd->num_clks, + sizeof(*pd->clks), GFP_KERNEL); + if (!pd->clks) + return -ENOMEM; + } else { + dev_dbg(pmu->dev, "%s: don't have clocks: %d\n", + node->name, pd->num_clks); + pd->num_clks = 0; + } for (i = 0; i < pd->num_clks; i++) { pd->clks[i].clk = of_clk_get(node, i);
The of_count_phandle_with_args() can fail and return error(for example, rk3399 pd_vio doesn't have clocks). That would break the pd probe. Add a sanity check on pd->num_clks to avoid that. Fixes: 65084121d59d ("soc: rockchip: power-domain: use clk_bulk APIs") Reported-by: Shawn Lin <shawn.lin@rock-chips.com> Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> --- drivers/soc/rockchip/pm_domains.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)