diff options
| author |   Christos Gkekas <chris.gekas@gmail.com> | 2017-09-10 14:55:29 +0100 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2017-09-13 09:42:27 -0700 |
| commit | 8b5d729a3a8a07fe273af266e90bc52114dd69a6 (patch) | |
| tree | 8d96a48c3f97e086053600502eff5503cb3a80f3 /drivers/spi | |
| parent | Merge remote-tracking branch 'spi/topic/xlp' into spi-next (diff) | |
| download | linux-dev-8b5d729a3a8a07fe273af266e90bc52114dd69a6.tar.xz linux-dev-8b5d729a3a8a07fe273af266e90bc52114dd69a6.zip | |
spi: stm32: Fix logical error in stm32_spi_prepare_mbr()
stm32_spi_prepare_mbr() is returning an error value when div is less
than SPI_MBR_DIV_MIN *and* greater than SPI_MBR_DIV_MAX, which always
evaluates to false. This should change to use *or*.
Signed-off-by: Christos Gkekas <chris.gekas@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-stm32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-stm32.c b/drivers/spi/spi-stm32.c index 680cdf549506..ba9743fa2326 100644 --- a/drivers/spi/spi-stm32.c +++ b/drivers/spi/spi-stm32.c @@ -263,8 +263,8 @@ static int stm32_spi_prepare_mbr(struct stm32_spi *spi, u32 speed_hz) * no need to check it there. * However, we need to ensure the following calculations. */ - if ((div < SPI_MBR_DIV_MIN) && - (div > SPI_MBR_DIV_MAX)) + if (div < SPI_MBR_DIV_MIN || + div > SPI_MBR_DIV_MAX) return -EINVAL; /* Determine the first power of 2 greater than or equal to div */ |