50 lines
1.8 KiB
Diff
50 lines
1.8 KiB
Diff
|
From: Sebastian Reichel <sebastian.reichel@collabora.com>
|
||
|
|
To: Michael Turquette <mturquette@baylibre.com>,
|
||
|
|
Stephen Boyd <sboyd@kernel.org>,
|
||
|
|
linux-clk@vger.kernel.org
|
||
|
|
Cc: Elaine Zhang <zhangqing@rock-chips.com>,
|
||
|
|
Kever Yang <kever.yang@rock-chips.com>,
|
||
|
|
Heiko Stuebner <heiko@sntech.de>,
|
||
|
|
Rob Herring <robh+dt@kernel.org>,
|
||
|
|
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
|
||
|
|
Conor Dooley <conor+dt@kernel.org>,
|
||
|
|
huangtao@rock-chips.com, andy.yan@rock-chips.com,
|
||
|
|
Michal Tomek <mtdev79b@gmail.com>, Ilya K <me@0upti.me>,
|
||
|
|
Chad LeClair <leclair@gmail.com>,
|
||
|
|
devicetree@vger.kernel.org, linux-rockchip@lists.infradead.org,
|
||
|
|
Sebastian Reichel <sebastian.reichel@collabora.com>,
|
||
|
|
kernel@collabora.com
|
||
|
|
Subject: [PATCH v9 5/7] clk: rockchip: fix error for unknown clocks
|
||
|
|
Date: Mon, 25 Mar 2024 20:33:36 +0100 [thread overview]
|
||
|
|
Message-ID: <20240325193609.237182-6-sebastian.reichel@collabora.com> (raw)
|
||
|
|
In-Reply-To: <20240325193609.237182-1-sebastian.reichel@collabora.com>
|
||
|
|
|
||
|
|
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.
|
||
|
|
|
||
|
|
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
|
||
|
|
---
|
||
|
|
drivers/clk/rockchip/clk.c | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
--- a/drivers/clk/rockchip/clk.c
|
||
|
|
+++ b/drivers/clk/rockchip/clk.c
|
||
|
|
@@ -444,12 +444,13 @@ void rockchip_clk_register_branches(stru
|
||
|
|
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) {
|