From 01b3fa0465671f536f1347c556931f722e1d56c1 Mon Sep 17 00:00:00 2001
From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 2 Jul 2011 08:38:00 +0000
Subject: package/mtd: don't append jffs2 data multiple times

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27358 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/mtd/Makefile  | 2 +-
 package/mtd/src/mtd.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'package/mtd')

diff --git a/package/mtd/Makefile b/package/mtd/Makefile
index dd8b24a27..f416d6bb1 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 7f5816539..b33582668 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;
-- 
cgit v1.2.3