sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

CFI Flash driver: Fix error path 

We forgot to close the file when parse_area_spec() failed.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2008-08-11 09:50:54 +02:00
parent 2db67353f3
commit da4d33969e
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
commands/flash.c
View File

@ -43,6 +43,7 @@ static int do_flerase (cmd_tbl_t *cmdtp, int argc, char *argv[])
char *filename = NULL;
struct stat s;
unsigned long start = 0, size = ~0;
int ret = 0;
if (argc == 1) {
u_boot_cmd_usage(cmdtp);
@ -69,20 +70,20 @@ static int do_flerase (cmd_tbl_t *cmdtp, int argc, char *argv[])
return 1;
}
if (argc == 3)
if (parse_area_spec(argv[2], &start, &size)) {
printf("could not parse: %s\n", argv[optind]);
return 1;
}
if(erase(fd, size, start)) {
perror("erase");
return 1;
if (argc == 3 && parse_area_spec(argv[2], &start, &size)) {
printf("could not parse: %s\n", argv[optind]);
ret = 1;
goto out;
}
if (erase(fd, size, start)) {
perror("erase");
ret = 1;
}
out:
close(fd);
return 0;
return ret;
}
static const __maybe_unused char cmd_erase_help[] =