From 0a3e5aeaf6410dd5ee34d76312182872902b948a Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Fri, 24 Jul 2009 12:18:54 +0000 Subject: If writing failed, verifying is pointless Abort instead. Corresponding to flashrom svn r666. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Oliver Niesner --- flashrom.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'flashrom.c') diff --git a/flashrom.c b/flashrom.c index 5764872..cb0da72 100644 --- a/flashrom.c +++ b/flashrom.c @@ -851,12 +851,17 @@ int main(int argc, char *argv[]) fprintf(stderr, "Error: flashrom has no write function for this flash chip.\n"); return 1; } - ret |= flash->write(flash, buf); - if (!ret) printf("COMPLETE.\n"); + ret = flash->write(flash, buf); + if (ret) { + fprintf(stderr, "FAILED!\n"); + return 1; + } else { + printf("COMPLETE.\n"); + } } if (verify_it) - ret |= verify_flash(flash, buf); + ret = verify_flash(flash, buf); programmer_shutdown(); -- cgit v1.1