X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fpatches-3.9%2F401-partial_eraseblock_write.patch;fp=target%2Flinux%2Fgeneric%2Fpatches-3.9%2F401-partial_eraseblock_write.patch;h=f367e1e9f6f2030afb6d4d56daaa2449a79846ea;hb=f0c06cd9cc1f1403b4918cdecfbc202a1f361bfb;hp=f2fa3676fbf552fe6ab00758bb872adf31ce3adf;hpb=1ba51c8a6a4e6c47b59a7cffb8f9e174b53fc1c6;p=openwrt.git

diff --git a/target/linux/generic/patches-3.9/401-partial_eraseblock_write.patch b/target/linux/generic/patches-3.9/401-partial_eraseblock_write.patch
index f2fa3676fb..f367e1e9f6 100644
--- a/target/linux/generic/patches-3.9/401-partial_eraseblock_write.patch
+++ b/target/linux/generic/patches-3.9/401-partial_eraseblock_write.patch
@@ -9,7 +9,7 @@
  /* Our partition linked list */
  static LIST_HEAD(mtd_partitions);
  static DEFINE_MUTEX(mtd_partitions_mutex);
-@@ -230,13 +232,60 @@ static int part_erase(struct mtd_info *m
+@@ -230,13 +232,61 @@ static int part_erase(struct mtd_info *m
  	struct mtd_part *part = PART(mtd);
  	int ret;
  
@@ -33,6 +33,7 @@
 +				part->master->erasesize,
 +				&readlen, instr->erase_buf);
 +
++			instr->len += instr->erase_buf_ofs;
 +			instr->partial_start = true;
 +		} else {
 +			mtd_ofs = part->offset + part->mtd.size;
@@ -70,7 +71,7 @@
  	return ret;
  }
  
-@@ -244,7 +293,25 @@ void mtd_erase_callback(struct erase_inf
+@@ -244,7 +294,25 @@ void mtd_erase_callback(struct erase_inf
  {
  	if (instr->mtd->_erase == part_erase) {
  		struct mtd_part *part = PART(instr->mtd);
@@ -96,7 +97,7 @@
  		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
  			instr->fail_addr -= part->offset;
  		instr->addr -= part->offset;
-@@ -504,18 +571,24 @@ static struct mtd_part *allocate_partiti
+@@ -504,18 +572,24 @@ static struct mtd_part *allocate_partiti
  	if ((slave->mtd.flags & MTD_WRITEABLE) &&
  	    mtd_mod_by_eb(slave->offset, &slave->mtd)) {
  		/* Doesn't start on a boundary of major erase size */