From 3e56ecec435d30e25fcffb971f8c9627e85ac1df Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Sun, 15 Nov 2015 19:31:37 -0800 Subject: [PATCH] sf: Correct flash->flags for SST flash flash->flags for SST flash should be updated for both DM and non-DM flash drivers. Signed-off-by: Bin Meng Reviewed-by: Jagan Teki --- drivers/mtd/spi/sf_probe.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index 52dace42ee..a619182a75 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -164,14 +164,15 @@ static int spi_flash_validate_params(struct spi_slave *spi, u8 *idcode, flash->memory_map = spi->memory_map; flash->dual_flash = flash->spi->option; + /* Assign spi flash flags */ + if (params->flags & SST_WR) + flash->flags |= SNOR_F_SST_WR; + /* Assign spi_flash ops */ #ifndef CONFIG_DM_SPI_FLASH flash->write = spi_flash_cmd_write_ops; #if defined(CONFIG_SPI_FLASH_SST) - if (params->flags & SST_WR) - flash->flags |= SNOR_F_SST_WR; - - if (params->flags & SNOR_F_SST_WR) { + if (flash->flags & SNOR_F_SST_WR) { if (flash->spi->op_mode_tx & SPI_OPM_TX_BP) flash->write = sst_write_bp; else -- 2.25.1