From: Jules Maselbas <jmaselbas@zdiv.net>
To: barebox@lists.infradead.org
Cc: Jules Maselbas <jmaselbas@zdiv.net>
Subject: [PATCH 2/6] clk: divider: add error code propagation
Date: Thu, 7 Nov 2024 15:57:18 +0100 [thread overview]
Message-ID: <20241107145722.5145-3-jmaselbas@zdiv.net> (raw)
In-Reply-To: <20241107145722.5145-1-jmaselbas@zdiv.net>
divider_get_val can return a negative error code and should not be used
as a valid divider.
Signed-off-by: Jules Maselbas <jmaselbas@zdiv.net>
---
drivers/clk/clk-divider.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
index ccab70aecc..b05b042da5 100644
--- a/drivers/clk/clk-divider.c
+++ b/drivers/clk/clk-divider.c
@@ -308,6 +308,7 @@ static int clk_divider_set_rate(struct clk_hw *hw, unsigned long rate,
struct clk *clk = clk_hw_to_clk(hw);
struct clk_divider *divider = to_clk_divider(hw);
unsigned int value;
+ int ret;
u32 val;
if (divider->flags & CLK_DIVIDER_READ_ONLY)
@@ -320,8 +321,10 @@ static int clk_divider_set_rate(struct clk_hw *hw, unsigned long rate,
clk_set_rate(clk_get_parent(clk), parent_rate);
}
- value = divider_get_val(rate, parent_rate, divider->table,
+ value = ret = divider_get_val(rate, parent_rate, divider->table,
divider->width, divider->flags);
+ if (ret < 0)
+ return ret;
val = readl(divider->reg);
val &= ~(clk_div_mask(divider->width) << divider->shift);
--
2.46.2
next prev parent reply other threads:[~2024-11-07 15:00 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-07 14:57 [PATCH 0/6] Initial support for Allwinner A64 SoC Jules Maselbas
2024-11-07 14:57 ` [PATCH 1/6] clk: clk-composite: fix callback guard in clk_composite_round_rate Jules Maselbas
2024-11-07 15:05 ` Ahmad Fatoum
2024-11-08 10:21 ` (subset) " Sascha Hauer
2024-11-07 14:57 ` Jules Maselbas [this message]
2024-11-13 8:47 ` [PATCH 2/6] clk: divider: add error code propagation Ahmad Fatoum
2024-11-07 14:57 ` [PATCH 3/6] clk: Add clock driver for sun50i-a64 Jules Maselbas
2024-11-08 10:39 ` Sascha Hauer
2024-11-08 11:08 ` Jules Maselbas
2024-11-08 12:59 ` Sascha Hauer
2024-11-12 15:58 ` Jules Maselbas
2024-11-13 8:42 ` Sascha Hauer
2024-11-07 14:57 ` [PATCH 4/6] pinctrl: Add sun50i-a64 pinctrl driver Jules Maselbas
2024-11-08 10:48 ` Sascha Hauer
2024-11-07 14:57 ` [PATCH 5/6] mci: Add sunxi-mmc driver Jules Maselbas
2024-11-07 14:57 ` [PATCH 6/6] ARM: sunxi: Introduce mach-sunxi Jules Maselbas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241107145722.5145-3-jmaselbas@zdiv.net \
--to=jmaselbas@zdiv.net \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox