From dd625be2e7e3a21a77d488e4a3528520772840bf Mon Sep 17 00:00:00 2001 From: T Karthik Reddy Date: Wed, 27 Mar 2019 11:45:45 +0530 Subject: [PATCH] drivers: mtd: spi: Check SPI_TX_QUAD mode if RD_QUADIO flag is set This patch checks for SPI_TX_QUAD mode if RD_QUADIO flag is set, as RD_QUADIO uses 4 lines for TX. If SPI_TX_QUAD mode is not set then CMD_READ_QUAD_IO_FAST should not be used. Signed-off-by: T Karthik Reddy Signed-off-by: Siva Durga Prasad Paladugu Signed-off-by: Michal Simek --- drivers/mtd/spi/spi_flash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index 570613acc3..ac71fbb8d1 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -1677,7 +1677,7 @@ int spi_flash_scan(struct spi_flash *flash) if (((JEDEC_MFR(info) == SPI_FLASH_CFI_MFR_SPANSION) && (info->id[5] == SPI_FLASH_SPANSION_S25FS_FMLY)) || ((JEDEC_MFR(info) == SPI_FLASH_CFI_MFR_ISSI) && - info->flags & RD_QUADIO)) + info->flags & RD_QUADIO && spi->mode & SPI_TX_QUAD)) flash->read_cmd = CMD_READ_QUAD_IO_FAST; } else if (spi->mode & SPI_RX_DUAL && info->flags & RD_DUAL) { flash->read_cmd = CMD_READ_DUAL_OUTPUT_FAST;