diff options
Diffstat (limited to 'miscutils/nandwrite.c')
| -rw-r--r-- | miscutils/nandwrite.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c index 09bcaaf63..f111c6363 100644 --- a/miscutils/nandwrite.c +++ b/miscutils/nandwrite.c | |||
| @@ -101,7 +101,7 @@ static unsigned next_good_eraseblock(int fd, struct mtd_info_user *meminfo, | |||
| 101 | 101 | ||
| 102 | if (block_offset >= meminfo->size) { | 102 | if (block_offset >= meminfo->size) { |
| 103 | if (IS_NANDWRITE) | 103 | if (IS_NANDWRITE) |
| 104 | bb_error_msg_and_die("not enough space in MTD device"); | 104 | bb_simple_error_msg_and_die("not enough space in MTD device"); |
| 105 | return block_offset; /* let the caller exit */ | 105 | return block_offset; /* let the caller exit */ |
| 106 | } | 106 | } |
| 107 | offs = block_offset; | 107 | offs = block_offset; |
| @@ -174,7 +174,7 @@ int nandwrite_main(int argc UNUSED_PARAM, char **argv) | |||
| 174 | meminfo_writesize = meminfo.writesize; | 174 | meminfo_writesize = meminfo.writesize; |
| 175 | 175 | ||
| 176 | if (mtdoffset & (meminfo_writesize - 1)) | 176 | if (mtdoffset & (meminfo_writesize - 1)) |
| 177 | bb_error_msg_and_die("start address is not page aligned"); | 177 | bb_simple_error_msg_and_die("start address is not page aligned"); |
| 178 | 178 | ||
| 179 | filebuf = xmalloc(meminfo_writesize); | 179 | filebuf = xmalloc(meminfo_writesize); |
| 180 | oobbuf = xmalloc(meminfo.oobsize); | 180 | oobbuf = xmalloc(meminfo.oobsize); |
| @@ -248,9 +248,9 @@ int nandwrite_main(int argc UNUSED_PARAM, char **argv) | |||
| 248 | } | 248 | } |
| 249 | if (cnt < meminfo_writesize) { | 249 | if (cnt < meminfo_writesize) { |
| 250 | if (IS_NANDDUMP) | 250 | if (IS_NANDDUMP) |
| 251 | bb_error_msg_and_die("short read"); | 251 | bb_simple_error_msg_and_die("short read"); |
| 252 | if (!(opts & OPT_p)) | 252 | if (!(opts & OPT_p)) |
| 253 | bb_error_msg_and_die("input size is not rounded up to page size, " | 253 | bb_simple_error_msg_and_die("input size is not rounded up to page size, " |
| 254 | "use -p to zero pad"); | 254 | "use -p to zero pad"); |
| 255 | /* zero pad to end of write block */ | 255 | /* zero pad to end of write block */ |
| 256 | memset(filebuf + cnt, 0, meminfo_writesize - cnt); | 256 | memset(filebuf + cnt, 0, meminfo_writesize - cnt); |
| @@ -273,7 +273,7 @@ int nandwrite_main(int argc UNUSED_PARAM, char **argv) | |||
| 273 | /* We filled entire MTD, but did we reach EOF on input? */ | 273 | /* We filled entire MTD, but did we reach EOF on input? */ |
| 274 | if (full_read(STDIN_FILENO, filebuf, meminfo_writesize) != 0) { | 274 | if (full_read(STDIN_FILENO, filebuf, meminfo_writesize) != 0) { |
| 275 | /* no */ | 275 | /* no */ |
| 276 | bb_error_msg_and_die("not enough space in MTD device"); | 276 | bb_simple_error_msg_and_die("not enough space in MTD device"); |
| 277 | } | 277 | } |
| 278 | } | 278 | } |
| 279 | 279 | ||