Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05521bd3 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Cyrille Pitchen
Browse files

mtd: spi-nor: stm32-quadspi: Fix uninitialized error return code



With gcc 4.1.2:

    drivers/mtd/spi-nor/stm32-quadspi.c: In function ‘stm32_qspi_tx_poll’:
    drivers/mtd/spi-nor/stm32-quadspi.c:230: warning: ‘ret’ may be used uninitialized in this function

Indeed, if stm32_qspi_cmd.len is zero, ret will be uninitialized.
This length is passed from outside the driver using the
spi_nor.{read,write}{,_reg}() callbacks.

Several functions in drivers/mtd/spi-nor/spi-nor.c (e.g. write_enable(),
write_disable(), and erase_chip()) call spi_nor.write_reg() with a zero
length.

Fix this by returning an explicit zero on success.

Fixes: 0d43d7ab ("mtd: spi-nor: add driver for STM32 quad spi flash controller")
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarLudovic Barre <ludovic.barre@st.com>
Signed-off-by: default avatarCyrille Pitchen <cyrille.pitchen@wedev4u.fr>
parent b8cc0012
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -240,12 +240,12 @@ static int stm32_qspi_tx_poll(struct stm32_qspi *qspi,
						 STM32_QSPI_FIFO_TIMEOUT_US);
		if (ret) {
			dev_err(qspi->dev, "fifo timeout (stat:%#x)\n", sr);
			break;
			return ret;
		}
		tx_fifo(buf++, qspi->io_base + QUADSPI_DR);
	}

	return ret;
	return 0;
}

static int stm32_qspi_tx_mm(struct stm32_qspi *qspi,