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 <jaganna@xilinx.com>
Acked-by: Punnaiah Choudary Kalluri <punnaia@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c
index 03f3cdb88a16cebb4e42b537df0649c7a4f64b07..68759c747350100cfd6f570bb9d1ca5ec16504eb 100644 (file)
--- 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);