diff options
author | Sebastian Reichel <sebastian.reichel@collabora.com> | 2024-03-25 20:33:36 +0100 |
---|---|---|
committer | Heiko Stuebner <heiko@sntech.de> | 2024-08-30 16:59:24 +0200 |
commit | 12fd64babaca4dc09d072f63eda76ba44119816a (patch) | |
tree | f82974830c22dffaf696ab35c51f75626efc4cbe /drivers/clk/rockchip | |
parent | clk: rockchip: rk3588: drop unused code (diff) | |
download | linux-12fd64babaca4dc09d072f63eda76ba44119816a.tar.xz linux-12fd64babaca4dc09d072f63eda76ba44119816a.zip |
clk: rockchip: fix error for unknown clocks
There is a clk == NULL check after the switch to check for
unsupported clk types. Since clk is re-assigned in a loop,
this check is useless right now for anything but the first
round. Let's fix this up by assigning clk = NULL in the
loop before the switch statement.
Fixes: a245fecbb806 ("clk: rockchip: add basic infrastructure for clock branches")
Cc: stable@vger.kernel.org
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
[added fixes + stable-cc]
Link: https://lore.kernel.org/r/20240325193609.237182-6-sebastian.reichel@collabora.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Diffstat (limited to 'drivers/clk/rockchip')
-rw-r--r-- | drivers/clk/rockchip/clk.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c index 73d2cbdc716b..2fa7253c73b2 100644 --- a/drivers/clk/rockchip/clk.c +++ b/drivers/clk/rockchip/clk.c @@ -450,12 +450,13 @@ void rockchip_clk_register_branches(struct rockchip_clk_provider *ctx, struct rockchip_clk_branch *list, unsigned int nr_clk) { - struct clk *clk = NULL; + struct clk *clk; unsigned int idx; unsigned long flags; for (idx = 0; idx < nr_clk; idx++, list++) { flags = list->flags; + clk = NULL; /* catch simple muxes */ switch (list->branch_type) { |