diff options
Diffstat (limited to 'updater')
| -rw-r--r-- | updater/blockimg.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/updater/blockimg.c b/updater/blockimg.c index ce6360099..5d0f1560c 100644 --- a/updater/blockimg.c +++ b/updater/blockimg.c @@ -677,7 +677,7 @@ static int LoadStash(const char* base, const char* id, int verify, int* blocks, lsout: if (fd != -1) { - TEMP_FAILURE_RETRY(close(fd)); + close(fd); } if (fn) { @@ -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; } } } |