openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-26 22:52:34 +02:00
Code Issues Releases Wiki Activity

Remove exit() call from show_id

Browse Source 
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>
This commit is contained in:
Niklas Söderlund 2012-06-16 00:11:16 +00:00 committed by Carl-Daniel Hailfinger
parent 4099a8a891
commit 9e42376c38
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
flashrom.c
View File

@ -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
}

2
layout.c
View File

@ -137,7 +137,7 @@ int show_id(uint8_t *bios, int size, int force)
"\n\n",
mainboard_vendor, mainboard_part, lb_vendor,
lb_part);
exit(1);
return 1;
}
}