diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2019-08-14 21:10:37 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2019-08-16 10:27:29 -0700 |
| commit | a7b85ad25a97cf897b4819a121655c483d86156f (patch) | |
| tree | 4d79e2614df3dfc74691e4226b00365fa69f9d02 /drivers/clk/sunxi-ng/ccu_common.c | |
| parent | e0e04fc866929f58600aad66b969d5e1572f9e54 (diff) | |
| download | linux-stable-a7b85ad25a97cf897b4819a121655c483d86156f.tar.gz linux-stable-a7b85ad25a97cf897b4819a121655c483d86156f.tar.bz2 linux-stable-a7b85ad25a97cf897b4819a121655c483d86156f.zip | |
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: 1d80c14248d6 ("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>
Diffstat (limited to 'drivers/clk/sunxi-ng/ccu_common.c')
| -rw-r--r-- | drivers/clk/sunxi-ng/ccu_common.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/clk/sunxi-ng/ccu_common.c b/drivers/clk/sunxi-ng/ccu_common.c index 7fe3ac980e5f..2e20e650b6c0 100644 --- a/drivers/clk/sunxi-ng/ccu_common.c +++ b/drivers/clk/sunxi-ng/ccu_common.c @@ -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; } } |