commit 0d3b596aa35fd828f2147c6d3c86d4e2730f7b29
author Jagannadha Sutradharudu Teki <jagannadha.sutradharudu-teki@xilinx.com> Mon May 27 10:14:14 2013 +0000
committer Jagannadha Sutradharudu Teki <jaganna@xilinx.com> Mon Jun 03 00:04:40 2013 +0530
tree 210d02e51d77aeb8764d380759d82ec88fd7e43b
parent e4eaef8910df805d511b1cb9b2caafa7d2827fdc

sf: Fix sf read for memory-mapped SPI flashes

Missing return after memcpy is done for memory-mapped SPI flashes,
hence added retun 0 after memcpy done.

The return is missing in below patch
"sf: Enable FDT-based configuration and memory mapping"
(sha1: bb8215f437a7c948eec82a6abe754c226978bd6d)

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Acked-by: Simon Glass <sjg@chromium.org>

drivers/mtd/spi/spi_flash.c

diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c
index 111185a..6fa932c 100644
--- a/drivers/mtd/spi/spi_flash.c
+++ b/drivers/mtd/spi/spi_flash.c
@@ -150,8 +150,10 @@
 	u8 cmd[5];
 
 	/* Handle memory-mapped SPI */
-	if (flash->memory_map)
+	if (flash->memory_map) {
 		memcpy(data, flash->memory_map + offset, len);
+		return 0;
+	}
 
 	cmd[0] = CMD_READ_ARRAY_FAST;
 	spi_flash_addr(offset, cmd);