[PATCH v4 18/23] read: Tidy up use of map_sysmem() in the read command

[Simon Glass]

Rename the variable to 'ptr' since it is a pointer, not an address. Make
sure to unmap the pointer.

Signed-off-by: Simon Glass <s...@chromium.org>
---

(no changes since v3)

Changes in v3:
- Correct the commit subject and message

 cmd/read.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/cmd/read.c b/cmd/read.c
index af54bd17654..8e21f004423 100644
--- a/cmd/read.c
+++ b/cmd/read.c
@@ -20,7 +20,7 @@ do_rw(struct cmd_tbl *cmdtp, int flag, int argc, char *const 
argv[])
        struct disk_partition part_info;
        ulong offset, limit;
        uint blk, cnt, res;
-       void *addr;
+       void *ptr;
        int part;
 
        if (argc != 6) {
@@ -33,7 +33,7 @@ do_rw(struct cmd_tbl *cmdtp, int flag, int argc, char *const 
argv[])
        if (part < 0)
                return 1;
 
-       addr = map_sysmem(hextoul(argv[3], NULL), 0);
+       ptr = map_sysmem(hextoul(argv[3], NULL), 0);
        blk = hextoul(argv[4], NULL);
        cnt = hextoul(argv[5], NULL);
 
@@ -48,13 +48,15 @@ do_rw(struct cmd_tbl *cmdtp, int flag, int argc, char 
*const argv[])
 
        if (cnt + blk > limit) {
                printf("%s out of range\n", cmdtp->name);
+               unmap_sysmem(ptr);
                return 1;
        }
 
        if (IS_ENABLED(CONFIG_CMD_WRITE) && !strcmp(cmdtp->name, "write"))
-               res = blk_dwrite(dev_desc, offset + blk, cnt, addr);
+               res = blk_dwrite(dev_desc, offset + blk, cnt, ptr);
        else
-               res = blk_dread(dev_desc, offset + blk, cnt, addr);
+               res = blk_dread(dev_desc, offset + blk, cnt, ptr);
+       unmap_sysmem(ptr);
 
        if (res != cnt) {
                printf("%s error\n", cmdtp->name);
-- 
2.34.1