From: Simon Glass <sjg@chromium.org>
Date: Thu, 5 Mar 2015 19:25:18 +0000 (-0700)
Subject: Correct map_sysmem() logic in do_mem_mw()
X-Git-Tag: v2015.07-rc1~332
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cc5e196e0350055e3e438d5dc2341316027c8d93;p=oweals%2Fu-boot.git

Correct map_sysmem() logic in do_mem_mw()

This function does not unmap what it maps. Correct it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---

diff --git a/common/cmd_mem.c b/common/cmd_mem.c
index 3f85c1aa85..1cbf84f985 100644
--- a/common/cmd_mem.c
+++ b/common/cmd_mem.c
@@ -165,7 +165,7 @@ static int do_mem_mw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #endif
 	ulong	addr, count;
 	int	size;
-	void *buf;
+	void *buf, *start;
 	ulong bytes;
 
 	if ((argc < 3) || (argc > 4))
@@ -197,7 +197,8 @@ static int do_mem_mw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	}
 
 	bytes = size * count;
-	buf = map_sysmem(addr, bytes);
+	start = map_sysmem(addr, bytes);
+	buf = start;
 	while (count-- > 0) {
 		if (size == 4)
 			*((u32 *)buf) = (u32)writeval;
@@ -211,7 +212,7 @@ static int do_mem_mw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 			*((u8 *)buf) = (u8)writeval;
 		buf += size;
 	}
-	unmap_sysmem(buf);
+	unmap_sysmem(start);
 	return 0;
 }