Commit cf9ec1fc authored Jul 31, 2019 by Stephen Boyd

clk: actions: Don't reference clk_init_data after registration



A future patch is going to change semantics of clk_register() so that
clk_hw::init is guaranteed to be NULL after a clk is registered. Avoid
referencing this member here so that we don't run into NULL pointer
exceptions.

Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Link: https://lkml.kernel.org/r/20190731193517.237136-2-sboyd@kernel.org


[sboyd@kernel.org: Move name to after checking for error or NULL hw]
Acked-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

parent 5f9e832c

drivers/clk/actions/owl-common.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -68,16 +68,17 @@ int owl_clk_probe(struct device dev, struct clk_hw_onecell_data hw_clks)
		struct clk_hw *hw;

		for (i = 0; i < hw_clks->num; i++) {
		const char *name;

		hw = hw_clks->hws[i];

		if (IS_ERR_OR_NULL(hw))
		continue;

		name = hw->init->name;
		ret = devm_clk_hw_register(dev, hw);
		if (ret) {
		dev_err(dev, "Couldn't register clock %d - %s\n",
		i, hw->init->name);
		i, name);
		return ret;
		}
		}

Admin message