diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2019-07-31 12:35:15 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-07 18:59:08 +0200 |
| commit | 5772dedde98759dbbf4a5da527b0c8dfcc4f1311 (patch) | |
| tree | 19712477734e08fe4b9feafacc9c9dfbade51e52 | |
| parent | 3c384b6618181461fca4ecbbaf84c8fbf0df0c14 (diff) | |
| download | linux-stable-5772dedde98759dbbf4a5da527b0c8dfcc4f1311.tar.gz linux-stable-5772dedde98759dbbf4a5da527b0c8dfcc4f1311.tar.bz2 linux-stable-5772dedde98759dbbf4a5da527b0c8dfcc4f1311.zip | |
clk: sprd: Don't reference clk_init_data after registration
[ Upstream commit f6c90df8e7e33c3dc33d4d7471bc42c232b0510e ]
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: Chunyan Zhang <zhang.chunyan@linaro.org>
Cc: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Link: https://lkml.kernel.org/r/20190731193517.237136-8-sboyd@kernel.org
Acked-by: Baolin Wang <baolin.wang@linaro.org>
Acked-by: Chunyan Zhang <zhang.chunyan@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/clk/sprd/common.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/clk/sprd/common.c b/drivers/clk/sprd/common.c index e038b0447206..8bdab1c3013b 100644 --- a/drivers/clk/sprd/common.c +++ b/drivers/clk/sprd/common.c @@ -71,16 +71,17 @@ int sprd_clk_probe(struct device *dev, struct clk_hw_onecell_data *clkhw) struct clk_hw *hw; for (i = 0; i < clkhw->num; i++) { + const char *name; hw = clkhw->hws[i]; - if (!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; } } |