diff options
author | Niklas Söderlund <niso@kth.se> | 2012-06-16 00:11:16 +0000 |
---|---|---|
committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2012-06-16 00:11:16 +0000 |
commit | 9e42376c384d1f81deac2cabd8fb423f902b42f4 (patch) | |
tree | f9a0004150190d234c13927e173878f302251412 /flashrom.c | |
parent | 4099a8a891cabc3f38f6c7dc60bc71a1fd76ec8a (diff) | |
download | ast2050-flashrom-9e42376c384d1f81deac2cabd8fb423f902b42f4.zip ast2050-flashrom-9e42376c384d1f81deac2cabd8fb423f902b42f4.tar.gz |
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: Niklas Söderlund <niso@kth.se>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Diffstat (limited to 'flashrom.c')
-rw-r--r-- | flashrom.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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 } |