openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-01 22:21:16 +02:00
Code Issues Releases Wiki Activity

Remove programmer_shutdown() from doit()

Browse Source 
Because the programmer initialization that has to be called way
earlier and independently elsewhere, it does not make a lot of sense
to deinit within doit(). Also, free the logfile name at the end of
main() to catch more execution paths and because this moves it to
the other cleanup instructions.

Corresponding to flashrom svn r1788.

Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
This commit is contained in:
Stefan Tauner
2014-05-07 22:07:23 +00:00
parent f3607d191a
commit 20da4aa82c
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cli_classic.c
View File

@ -338,8 +338,7 @@ int main(int argc, char *argv[])
if (logfile && check_filename(logfile, "log"))
cli_classic_abort_usage();
if (logfile && open_logfile(logfile))
return 1;
free(logfile);
cli_classic_abort_usage();
#endif /* !STANDALONE */
#if CONFIG_PRINT_WIKI == 1
@ -522,8 +521,6 @@ int main(int argc, char *argv[])
*/
programmer_delay(100000);
ret |= doit(fill_flash, force, filename, read_it, write_it, erase_it, verify_it);
/* Note: doit() already calls programmer_shutdown(). */
goto out;
out_shutdown:
programmer_shutdown();
@ -539,6 +536,7 @@ out:
free((char *)chip_to_probe); /* Silence! Freeing is not modifying contents. */
chip_to_probe = NULL;
#ifndef STANDALONE
free(logfile);
ret |= close_logfile();
#endif /* !STANDALONE */
return ret;