From c34fa1c81b68f0edc436dfcbe5761713dddf7bdc Mon Sep 17 00:00:00 2001 From: Jagannadha Sutradharudu Teki Date: Tue, 1 Oct 2013 01:46:48 +0530 Subject: [PATCH] sf: Correct bank_sel to use write_addr instead of offset Corrected bank_sel in write ops to use write_addr instead of offset during merge. "Merge tag 'v2013.07' into xilinx/master-next" (sha1: 6978377d4b022d7fd9a8c6f720ebc2e5daaeb173) Signed-off-by: Jagannadha Sutradharudu Teki Acked-by: Punnaiah Choudary Kalluri 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 03f3cdb88a1..68759c74735 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -254,7 +254,7 @@ int spi_flash_cmd_write_multi(struct spi_flash *flash, u32 offset, #ifdef CONFIG_SPI_FLASH_BAR u8 bank_sel; - bank_sel = offset / SPI_FLASH_16MB_BOUN; + bank_sel = write_addr / SPI_FLASH_16MB_BOUN; if ((is_dual == MODE_DUAL_STACKED) && (flash->spi->u_page == 1)) bank_sel -= ((flash->size / 2) / SPI_FLASH_16MB_BOUN); -- 2.47.3