summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSami Tolvanen <samitolvanen@google.com>2015-05-28 19:39:33 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-28 19:39:33 +0200
commitdfcaf473511ed1ca7195c5f5901c1f325b58d97a (patch)
treea37550c760bf26300ed6e6277510b96da8c753c8
parentam d026a28c: am 9a5e2a26: am f272b9e7: Merge "Clean up the sleep()\'s after poking init services" (diff)
parentam cd391c23: am aa4df5c4: Merge "Handle BLKDISCARD failures" (diff)
downloadandroid_bootable_recovery-dfcaf473511ed1ca7195c5f5901c1f325b58d97a.tar
android_bootable_recovery-dfcaf473511ed1ca7195c5f5901c1f325b58d97a.tar.gz
android_bootable_recovery-dfcaf473511ed1ca7195c5f5901c1f325b58d97a.tar.bz2
android_bootable_recovery-dfcaf473511ed1ca7195c5f5901c1f325b58d97a.tar.lz
android_bootable_recovery-dfcaf473511ed1ca7195c5f5901c1f325b58d97a.tar.xz
android_bootable_recovery-dfcaf473511ed1ca7195c5f5901c1f325b58d97a.tar.zst
android_bootable_recovery-dfcaf473511ed1ca7195c5f5901c1f325b58d97a.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 ce6360099..42060f547 100644
--- a/updater/blockimg.c
+++ b/updater/blockimg.c
@@ -1485,7 +1485,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;
}
@@ -1509,7 +1508,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;
}
}
}