summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSami Tolvanen <samitolvanen@google.com>2015-04-27 12:24:29 +0200
committerSami Tolvanen <samitolvanen@google.com>2015-05-29 10:02:14 +0200
commit92eea1bc414a7b6faedaf812c33ede17403fcaf7 (patch)
tree7a45906571262ab88d182583850b31956af1af5d
parentSeparate uncrypt into two modes (diff)
downloadandroid_bootable_recovery-92eea1bc414a7b6faedaf812c33ede17403fcaf7.tar
android_bootable_recovery-92eea1bc414a7b6faedaf812c33ede17403fcaf7.tar.gz
android_bootable_recovery-92eea1bc414a7b6faedaf812c33ede17403fcaf7.tar.bz2
android_bootable_recovery-92eea1bc414a7b6faedaf812c33ede17403fcaf7.tar.lz
android_bootable_recovery-92eea1bc414a7b6faedaf812c33ede17403fcaf7.tar.xz
android_bootable_recovery-92eea1bc414a7b6faedaf812c33ede17403fcaf7.tar.zst
android_bootable_recovery-92eea1bc414a7b6faedaf812c33ede17403fcaf7.zip
Diffstat (limited to '')
-rw-r--r--updater/blockimg.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/updater/blockimg.c b/updater/blockimg.c
index a0e9aec6a..0e2ba4441 100644
--- a/updater/blockimg.c
+++ b/updater/blockimg.c
@@ -1424,7 +1424,6 @@ static int PerformCommandErase(CommandParameters* params) {
if (!S_ISBLK(st.st_mode)) {
fprintf(stderr, "not a block device; skipping erase\n");
- rc = 0;
goto pceout;
}
@@ -1448,7 +1447,7 @@ static int PerformCommandErase(CommandParameters* params) {
if (ioctl(params->fd, BLKDISCARD, &blocks) == -1) {
fprintf(stderr, "BLKDISCARD ioctl failed: %s\n", strerror(errno));
- // Continue anyway, nothing we can do
+ goto pceout;
}
}
}