diff options
author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2009-07-24 12:18:54 +0000 |
---|---|---|
committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2009-07-24 12:18:54 +0000 |
commit | 0a3e5aeaf6410dd5ee34d76312182872902b948a (patch) | |
tree | 8900da78fef5b193830de8a43ef713da4613990c | |
parent | 21eedec3a628320acf61e561ae22320d4e4d6b48 (diff) | |
download | flashrom-0a3e5aeaf6410dd5ee34d76312182872902b948a.tar.gz flashrom-0a3e5aeaf6410dd5ee34d76312182872902b948a.tar.bz2 flashrom-0a3e5aeaf6410dd5ee34d76312182872902b948a.zip |
If writing failed, verifying is pointless
Abort instead.
Corresponding to flashrom svn r666.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Oliver Niesner <oli@rhce.servebbs.net>
-rw-r--r-- | flashrom.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/flashrom.c b/flashrom.c index 576487274..cb0da7225 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(); |