From: Gabor Juhos <juhosg@openwrt.org>
Date: Sat, 2 Jul 2011 08:38:00 +0000 (+0000)
Subject: package/mtd: don't append jffs2 data multiple times
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f73ab64207f909d1611db70393376de996ba454e;p=openwrt%2Fsvn-archive%2Farchive.git

package/mtd: don't append jffs2 data multiple times

SVN-Revision: 27358
---

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;