diff options
| author | Codrin Ciubotariu <codrin.ciubotariu@microchip.com> | 2019-06-25 12:10:02 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-25 10:47:51 +0200 |
| commit | 3e5f29b6667539006d9d746c540507ca1e638244 (patch) | |
| tree | 3eb5d23db2fa6f559de7f89bfaa6a25e5b306783 /drivers/clk | |
| parent | 28fd9b37b6bb86c5d90694f4493c46b7d71cf9a6 (diff) | |
| download | linux-stable-3e5f29b6667539006d9d746c540507ca1e638244.tar.gz linux-stable-3e5f29b6667539006d9d746c540507ca1e638244.tar.bz2 linux-stable-3e5f29b6667539006d9d746c540507ca1e638244.zip | |
clk: at91: generated: Truncate divisor to GENERATED_MAX_DIV + 1
[ Upstream commit 1573eebeaa8055777eb753f9b4d1cbe653380c38 ]
In clk_generated_determine_rate(), if the divisor is greater than
GENERATED_MAX_DIV + 1, then the wrong best_rate will be returned.
If clk_generated_set_rate() will be called later with this wrong
rate, it will return -EINVAL, so the generated clock won't change
its value. Do no let the divisor be greater than GENERATED_MAX_DIV + 1.
Fixes: 8c7aa6328947 ("clk: at91: clk-generated: remove useless divisor loop")
Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Acked-by: Ludovic Desroches <ludovic.desroches@microchip.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/at91/clk-generated.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/clk/at91/clk-generated.c b/drivers/clk/at91/clk-generated.c index 33481368740e..113152425a95 100644 --- a/drivers/clk/at91/clk-generated.c +++ b/drivers/clk/at91/clk-generated.c @@ -153,6 +153,8 @@ static int clk_generated_determine_rate(struct clk_hw *hw, continue; div = DIV_ROUND_CLOSEST(parent_rate, req->rate); + if (div > GENERATED_MAX_DIV + 1) + div = GENERATED_MAX_DIV + 1; clk_generated_best_diff(req, parent, parent_rate, div, &best_diff, &best_rate); |