diff options
| author | Doug Zongker <dougz@android.com> | 2010-09-10 01:59:05 +0200 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-10 01:59:05 +0200 |
| commit | a2c9a1e8a2b99bd8197c83b2f749ec61bc0312f8 (patch) | |
| tree | 98348aa7f7a18d4914aeb193e5b2b9d7982677cb | |
| parent | am 4bc98062: add --show_text option to recovery (diff) | |
| parent | block is bad if ioctl() returns nonzero (diff) | |
| download | android_bootable_recovery-a2c9a1e8a2b99bd8197c83b2f749ec61bc0312f8.tar android_bootable_recovery-a2c9a1e8a2b99bd8197c83b2f749ec61bc0312f8.tar.gz android_bootable_recovery-a2c9a1e8a2b99bd8197c83b2f749ec61bc0312f8.tar.bz2 android_bootable_recovery-a2c9a1e8a2b99bd8197c83b2f749ec61bc0312f8.tar.lz android_bootable_recovery-a2c9a1e8a2b99bd8197c83b2f749ec61bc0312f8.tar.xz android_bootable_recovery-a2c9a1e8a2b99bd8197c83b2f749ec61bc0312f8.tar.zst android_bootable_recovery-a2c9a1e8a2b99bd8197c83b2f749ec61bc0312f8.zip | |
| -rw-r--r-- | mtdutils/mtdutils.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mtdutils/mtdutils.c b/mtdutils/mtdutils.c index 18e6a5d63..3e354e334 100644 --- a/mtdutils/mtdutils.c +++ b/mtdutils/mtdutils.c @@ -414,9 +414,12 @@ static int write_block(MtdWriteContext *ctx, const char *data) ssize_t size = partition->erase_size; while (pos + size <= (int) partition->size) { loff_t bpos = pos; - if (ioctl(fd, MEMGETBADBLOCK, &bpos) > 0) { + int ret = ioctl(fd, MEMGETBADBLOCK, &bpos); + if (ret != 0 && !(ret == -1 && errno == EOPNOTSUPP)) { add_bad_block_offset(ctx, pos); - fprintf(stderr, "mtd: not writing bad block at 0x%08lx\n", pos); + fprintf(stderr, + "mtd: not writing bad block at 0x%08lx (ret %d errno %d)\n", + pos, ret, errno); pos += partition->erase_size; continue; // Don't try to erase known factory-bad blocks. } |