summaryrefslogtreecommitdiff
path: root/package/mtd
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-02 08:38:00 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-02 08:38:00 +0000
commit01b3fa0465671f536f1347c556931f722e1d56c1 (patch)
tree7f85f0fc1b401e4ed7a6a2810a42a48d7c6d6250 /package/mtd
parent547c70662083576e4e6db6881dbd4ed335506077 (diff)
package/mtd: don't append jffs2 data multiple times
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27358 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mtd')
-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;