summaryrefslogtreecommitdiffstats
path: root/flashrom.c
diff options
context:
space:
mode:
authorCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2012-06-16 00:11:16 +0000
committerCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2012-06-16 00:11:16 +0000
commit5b74ad19c37b7f03a8ad46cf10fc3fcd6067143a (patch)
treef9a0004150190d234c13927e173878f302251412 /flashrom.c
parent49d72a06ce7c50164a532073cdb7207c1d6bf0c0 (diff)
downloadflashrom-5b74ad19c37b7f03a8ad46cf10fc3fcd6067143a.zip
flashrom-5b74ad19c37b7f03a8ad46cf10fc3fcd6067143a.tar.gz
Remove exit() call from show_id
The only caller is able to check the return code and handle it correctly. Binary file (standard input) matches Corresponding to flashrom svn r1545.
Diffstat (limited to 'flashrom.c')
-rw-r--r--flashrom.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/flashrom.c b/flashrom.c
index 518e3d4..0fdcd5f 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -1787,7 +1787,10 @@ int doit(struct flashctx *flash, int force, const char *filename, int read_it,
#if CONFIG_INTERNAL == 1
if (programmer == PROGRAMMER_INTERNAL)
- show_id(newcontents, size, force);
+ if (show_id(newcontents, size, force)) {
+ ret = 1;
+ goto out;
+ }
#endif
}
OpenPOWER on IntegriCloud