colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

read: Tidy up use of map_sysmem() in the read command

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

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2024-09-01 16:26:29 -06:00
committed by Tom Rini
parent cc6a1b6902
commit 42f5ffb239
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/read.c
View File

@@ -20,7 +20,7 @@ do_rw(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
struct disk_partition part_info; struct disk_partition part_info;
ulong offset, limit; ulong offset, limit;
uint blk, cnt, res; uint blk, cnt, res;
void *addr; void *ptr;
int part; int part;
if (argc != 6) { if (argc != 6) {
@@ -33,7 +33,7 @@ do_rw(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
if (part < 0) if (part < 0)
return 1; return 1;
addr = map_sysmem(hextoul(argv[3], NULL), 0); ptr = map_sysmem(hextoul(argv[3], NULL), 0);
blk = hextoul(argv[4], NULL); blk = hextoul(argv[4], NULL);
cnt = hextoul(argv[5], 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) { if (cnt + blk > limit) {
printf("%s out of range\n", cmdtp->name); printf("%s out of range\n", cmdtp->name);
unmap_sysmem(ptr);
return 1; return 1;
} }
if (IS_ENABLED(CONFIG_CMD_WRITE) && !strcmp(cmdtp->name, "write")) 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 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) { if (res != cnt) {
printf("%s error\n", cmdtp->name); printf("%s error\n", cmdtp->name);