git.openpandora.org
/
pandora-u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
08f622a
)
fs: fat: simplify gotos from read_bootsectandvi
author
Christian Taedcke
<christian.taedcke@weidmueller.com>
Wed, 15 Nov 2023 12:44:19 +0000
(13:44 +0100)
committer
Tom Rini
<trini@konsulko.com>
Wed, 29 Nov 2023 01:10:24 +0000
(20:10 -0500)
This simplifies the code a little bit.
Signed-off-by: Christian Taedcke <christian.taedcke@weidmueller.com>
fs/fat/fat.c
patch
|
blob
|
history
diff --git
a/fs/fat/fat.c
b/fs/fat/fat.c
index
c368c3b
..
77f225c
100644
(file)
--- a/
fs/fat/fat.c
+++ b/
fs/fat/fat.c
@@
-531,7
+531,8
@@
read_bootsectandvi(boot_sector *bs, volume_info *volinfo, int *fatsize)
if (disk_read(0, 1, block) < 0) {
debug("Error: reading block\n");
- goto fail;
+ ret = -1;
+ goto out_free;
}
memcpy(bs, block, sizeof(boot_sector));
@@
-556,10
+557,8
@@
read_bootsectandvi(boot_sector *bs, volume_info *volinfo, int *fatsize)
*fatsize = determine_legacy_fat_bits(bs);
}
memcpy(volinfo, vistart, sizeof(volume_info));
- goto exit;
-fail:
- ret = -1;
-exit:
+
+out_free:
free(block);
return ret;
}