summaryrefslogtreecommitdiff
path: root/package/mtd
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-11-24 16:18:34 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-11-24 16:18:34 +0000
commit04b604704b1e3445b4e0dfbf7a4ef38eca637032 (patch)
tree2d6fe80d6e861233a22aeecef825fef8d1d6c8dc /package/mtd
parent1fd328fb78d4ecdbfbd4912d5ea4552f22757017 (diff)
downloadmtk-20170518-04b604704b1e3445b4e0dfbf7a4ef38eca637032.zip
mtk-20170518-04b604704b1e3445b4e0dfbf7a4ef38eca637032.tar.gz
mtk-20170518-04b604704b1e3445b4e0dfbf7a4ef38eca637032.tar.bz2
mtd: fix r24132
SVN-Revision: 24134
Diffstat (limited to 'package/mtd')
-rw-r--r--package/mtd/src/mtd.c58
1 files changed, 29 insertions, 29 deletions
diff --git a/package/mtd/src/mtd.c b/package/mtd/src/mtd.c
index e4b6c79..5ec79dc 100644
--- a/package/mtd/src/mtd.c
+++ b/package/mtd/src/mtd.c
@@ -519,35 +519,35 @@ resume:
}
/* need to erase the next block before writing data to it */
- if(no_erase)
- {
- while (w + buflen > e) {
- if (!quiet)
- fprintf(stderr, "\b\b\b[e]");
-
-
- if (mtd_erase_block(fd, e) < 0) {
- if (next) {
- if (w < e) {
- write(fd, buf + offset, e - w);
- offset = e - w;
+ if(!no_erase)
+ {
+ while (w + buflen > e) {
+ if (!quiet)
+ fprintf(stderr, "\b\b\b[e]");
+
+
+ if (mtd_erase_block(fd, e) < 0) {
+ if (next) {
+ if (w < e) {
+ write(fd, buf + offset, e - w);
+ offset = e - w;
+ }
+ w = 0;
+ e = 0;
+ close(fd);
+ mtd = next;
+ fprintf(stderr, "\b\b\b \n");
+ goto resume;
+ } else {
+ fprintf(stderr, "Failed to erase block\n");
+ exit(1);
}
- w = 0;
- e = 0;
- close(fd);
- mtd = next;
- fprintf(stderr, "\b\b\b \n");
- goto resume;
- } else {
- fprintf(stderr, "Failed to erase block\n");
- exit(1);
}
- }
- /* erase the chunk */
- e += erasesize;
- }
- }
+ /* erase the chunk */
+ e += erasesize;
+ }
+ }
if (!quiet)
fprintf(stderr, "\b\b\b[w]");
@@ -665,9 +665,9 @@ int main (int argc, char **argv)
case 'r':
boot = 1;
break;
- case 'n':
- no_erase = 1;
- break;
+ case 'n':
+ no_erase = 1;
+ break;
case 'j':
jffs2file = optarg;
break;