Commit 9e42376c authored by Niklas Söderlund's avatar Niklas Söderlund Committed by Carl-Daniel Hailfinger
Browse files

Remove exit() call from show_id


The only caller is able to check the return code and handle it
correctly.

Corresponding to flashrom svn r1545.
Signed-off-by: default avatarNiklas Söderlund <niso@kth.se>
Acked-by: default avatarCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
parent 4099a8a8
...@@ -1787,7 +1787,10 @@ int doit(struct flashctx *flash, int force, const char *filename, int read_it, ...@@ -1787,7 +1787,10 @@ int doit(struct flashctx *flash, int force, const char *filename, int read_it,
#if CONFIG_INTERNAL == 1 #if CONFIG_INTERNAL == 1
if (programmer == PROGRAMMER_INTERNAL) if (programmer == PROGRAMMER_INTERNAL)
show_id(newcontents, size, force); if (show_id(newcontents, size, force)) {
ret = 1;
goto out;
}
#endif #endif
} }
......
...@@ -137,7 +137,7 @@ int show_id(uint8_t *bios, int size, int force) ...@@ -137,7 +137,7 @@ int show_id(uint8_t *bios, int size, int force)
"\n\n", "\n\n",
mainboard_vendor, mainboard_part, lb_vendor, mainboard_vendor, mainboard_part, lb_vendor,
lb_part); lb_part);
exit(1); return 1;
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment