diff options
| author | Martin Sperl <kernel@martin.sperl.org> | 2016-02-29 11:39:20 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-07 18:18:50 -0700 |
| commit | d43f1f993c8d0af8b2aac740b068c316d874c299 (patch) | |
| tree | b5c5c081681ce9d67477f0ef9032df2016dd3bb1 /drivers/clk | |
| parent | 609909668f24377eff05cf9a52e9a6ed0a855bbe (diff) | |
| download | linux-stable-d43f1f993c8d0af8b2aac740b068c316d874c299.tar.gz linux-stable-d43f1f993c8d0af8b2aac740b068c316d874c299.tar.bz2 linux-stable-d43f1f993c8d0af8b2aac740b068c316d874c299.zip | |
clk: bcm2835: divider value has to be 1 or more
commit 997f16bd5d2e9b3456027f96fcadfe1e2bf12f4e upstream.
Current clamping of a normal divider allows a value < 1 to be valid.
A divider of < 1 would actually only be possible if we had a PLL...
So this patch clamps the divider to 1.
Fixes: 41691b8862e2 ("clk: bcm2835: Add support for programming the
audio domain clocks")
Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/bcm/clk-bcm2835.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c index dd4164119280..670ae1837b72 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -1193,8 +1193,9 @@ static u32 bcm2835_clock_choose_div(struct clk_hw *hw, div += unused_frac_mask + 1; div &= ~unused_frac_mask; - /* Clamp to the limits. */ - div = max(div, unused_frac_mask + 1); + /* clamp to min divider of 1 */ + div = max_t(u32, div, 1 << CM_DIV_FRAC_BITS); + /* clamp to the highest possible fractional divider */ div = min_t(u32, div, GENMASK(data->int_bits + CM_DIV_FRAC_BITS - 1, CM_DIV_FRAC_BITS - data->frac_bits)); |