]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
spi: stm32: fix error check on mbr being -ve
authorColin Ian King <colin.king@canonical.com>
Thu, 22 Jun 2017 16:34:49 +0000 (17:34 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 23 Jun 2017 11:26:38 +0000 (12:26 +0100)
The error check of mbr < 0 is always false because mbr is a u32. Make
mbt an int so that a -ve error return from stm32_spi_prepare_mbr can be
detected.

Detected by CoverityScan, CID#1446586 ("Unsigned compared against 0")

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-stm32.c

index 0553f61ab3b7a577b34a3ea5469d9e118e20d4b5..305ecd5334fce9a1c95602c66d18453f92475abf 100644 (file)
@@ -857,7 +857,7 @@ static int stm32_spi_transfer_one_setup(struct stm32_spi *spi,
        }
 
        if (spi->cur_speed != transfer->speed_hz) {
-               u32 mbr;
+               int mbr;
 
                /* Update spi->cur_speed with real clock speed */
                mbr = stm32_spi_prepare_mbr(spi, transfer->speed_hz);
@@ -869,7 +869,7 @@ static int stm32_spi_transfer_one_setup(struct stm32_spi *spi,
                transfer->speed_hz = spi->cur_speed;
 
                cfg1_clrb |= SPI_CFG1_MBR;
-               cfg1_setb |= (mbr << SPI_CFG1_MBR_SHIFT) & SPI_CFG1_MBR;
+               cfg1_setb |= ((u32)mbr << SPI_CFG1_MBR_SHIFT) & SPI_CFG1_MBR;
        }
 
        if (cfg1_clrb || cfg1_setb)