diff options
| author | Christos Gkekas <chris.gekas@gmail.com> | 2017-09-10 09:55:29 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-09-13 12:42:27 -0400 |
| commit | 8b5d729a3a8a07fe273af266e90bc52114dd69a6 (patch) | |
| tree | 8d96a48c3f97e086053600502eff5503cb3a80f3 | |
| parent | ecb478bf866b8450c724958815e8d46b97c1b113 (diff) | |
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>
| -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) | |||
| 263 | * no need to check it there. | 263 | * no need to check it there. |
| 264 | * However, we need to ensure the following calculations. | 264 | * However, we need to ensure the following calculations. |
| 265 | */ | 265 | */ |
| 266 | if ((div < SPI_MBR_DIV_MIN) && | 266 | if (div < SPI_MBR_DIV_MIN || |
| 267 | (div > SPI_MBR_DIV_MAX)) | 267 | div > SPI_MBR_DIV_MAX) |
| 268 | return -EINVAL; | 268 | return -EINVAL; |
| 269 | 269 | ||
| 270 | /* Determine the first power of 2 greater than or equal to div */ | 270 | /* Determine the first power of 2 greater than or equal to div */ |