aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2011-07-02 08:38:00 +0000
committerGabor Juhos <juhosg@openwrt.org>2011-07-02 08:38:00 +0000
commit091ea637192e56227393f16a67f51bf66e1a567e (patch)
treee891eeaf37e5ee2a413a308ac1e074c907f461ae
parentb3a89652a54016c820858fd92e5dcbd497032194 (diff)
downloadupstream-091ea637192e56227393f16a67f51bf66e1a567e.tar.gz
upstream-091ea637192e56227393f16a67f51bf66e1a567e.tar.bz2
upstream-091ea637192e56227393f16a67f51bf66e1a567e.zip
package/mtd: don't append jffs2 data multiple times
SVN-Revision: 27358
-rw-r--r--package/mtd/Makefile2
-rw-r--r--package/mtd/src/mtd.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/package/mtd/Makefile b/package/mtd/Makefile
index dd8b24a276..f416d6bb18 100644
--- a/package/mtd/Makefile
+++ b/package/mtd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=mtd
-PKG_RELEASE:=15
+PKG_RELEASE:=16
PKG_BUILD_DIR := $(KERNEL_BUILD_DIR)/$(PKG_NAME)
STAMP_PREPARED := $(STAMP_PREPARED)_$(call confvar,CONFIG_MTD_REDBOOT_PARTS)
diff --git a/package/mtd/src/mtd.c b/package/mtd/src/mtd.c
index 7f5816539b..b33582668f 100644
--- a/package/mtd/src/mtd.c
+++ b/package/mtd/src/mtd.c
@@ -409,6 +409,9 @@ resume:
/* got an EOF marker - this is the place to add some jffs2 data */
skip = mtd_replace_jffs2(mtd, fd, e, jffs2file);
+ /* don't add it again */
+ jffs2file = NULL;
+
w += skip;
e += skip;
skip -= buflen;