Commit a7b85ad2 authored Aug 14, 2019 by Stephen Boyd

clk: sunxi: Don't call clk_hw_get_name() on a hw that isn't registered

The implementation of clk_hw_get_name() relies on the clk_core
associated with the clk_hw pointer existing. If of_clk_hw_register()
fails, there isn't a clk_core created yet, so calling clk_hw_get_name()
here fails. Extract the name first so we can print it later.

Fixes: 1d80c142 ("clk: sunxi-ng: Add common infrastructure")
Cc: Maxime Ripard <maxime.ripard@bootlin.com>
Cc: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

parent e0e04fc8

drivers/clk/sunxi-ng/ccu_common.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -97,14 +97,15 @@ int sunxi_ccu_probe(struct device_node node, void __iomem reg,

		for (i = 0; i < desc->hw_clks->num ; i++) {
		struct clk_hw *hw = desc->hw_clks->hws[i];
		const char *name;

		if (!hw)
		continue;

		name = hw->init->name;
		ret = of_clk_hw_register(node, hw);
		if (ret) {
		pr_err("Couldn't register clock %d - %s\n",
		i, clk_hw_get_name(hw));
		pr_err("Couldn't register clock %d - %s\n", i, name);
		goto err_clk_unreg;
		}
		}

Admin message