]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
clk: qcom: Don't reference clk_init_data after registration
authorStephen Boyd <sboyd@kernel.org>
Wed, 31 Jul 2019 19:35:12 +0000 (12:35 -0700)
committerStephen Boyd <sboyd@kernel.org>
Fri, 16 Aug 2019 17:20:07 +0000 (10:20 -0700)
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 <tdas@codeaurora.org>
Cc: Andy Gross <agross@kernel.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Link: https://lkml.kernel.org/r/20190731193517.237136-5-sboyd@kernel.org
Acked-by: Taniya Das <tdas@codeaurora.org>
drivers/clk/qcom/clk-rpmh.c

index c3fd632af1190d3cf1e32fa34ec1346724bdc3df..7a8a84dcb70d5e04b06a3383107ab6edad30f0da 100644 (file)
@@ -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;
                }
        }