diff options
author | Stephen Boyd <[email protected]> | 2019-07-31 12:35:12 -0700 |
---|---|---|
committer | Stephen Boyd <[email protected]> | 2019-08-16 10:20:07 -0700 |
commit | af884a5dfdef06644bdbd7d54ca865616f24b256 (patch) | |
tree | bb9015c509fa75ae6495ba15e696e57e8aec5224 | |
parent | 1610dd79d0f6202c5c1a91122255fa598679c13a (diff) |
clk: qcom: 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: Taniya Das <[email protected]>
Cc: Andy Gross <[email protected]>
Signed-off-by: Stephen Boyd <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
Acked-by: Taniya Das <[email protected]>
-rw-r--r-- | drivers/clk/qcom/clk-rpmh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c index c3fd632af119..7a8a84dcb70d 100644 --- a/drivers/clk/qcom/clk-rpmh.c +++ b/drivers/clk/qcom/clk-rpmh.c @@ -396,6 +396,7 @@ static int clk_rpmh_probe(struct platform_device *pdev) hw_clks = desc->clks; for (i = 0; i < desc->num_clks; i++) { + const char *name = hw_clks[i]->init->name; u32 res_addr; size_t aux_data_len; const struct bcm_db *data; @@ -426,8 +427,7 @@ static int clk_rpmh_probe(struct platform_device *pdev) ret = devm_clk_hw_register(&pdev->dev, hw_clks[i]); if (ret) { - dev_err(&pdev->dev, "failed to register %s\n", - hw_clks[i]->init->name); + dev_err(&pdev->dev, "failed to register %s\n", name); return ret; } } |