projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update 3.18 to 3.18.14
[openwrt.git]
/
target
/
linux
/
generic
/
patches-3.18
/
411-mtd-partial_eraseblock_write.patch
diff --git
a/target/linux/generic/patches-3.18/411-mtd-partial_eraseblock_write.patch
b/target/linux/generic/patches-3.18/411-mtd-partial_eraseblock_write.patch
index
0c117c2
..
7692d3d
100644
(file)
--- a/
target/linux/generic/patches-3.18/411-mtd-partial_eraseblock_write.patch
+++ b/
target/linux/generic/patches-3.18/411-mtd-partial_eraseblock_write.patch
@@
-97,7
+97,7
@@
if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
instr->fail_addr -= part->offset;
instr->addr -= part->offset;
if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
instr->fail_addr -= part->offset;
instr->addr -= part->offset;
-@@ -514,1
8 +582,21
@@ static struct mtd_part *allocate_partiti
+@@ -514,1
7 +582,20
@@ 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 */
if ((slave->mtd.flags & MTD_WRITEABLE) &&
mtd_mod_by_eb(slave->offset, &slave->mtd)) {
/* Doesn't start on a boundary of major erase size */
@@
-127,7
+127,6
@@
}
slave->mtd.ecclayout = master->ecclayout;
}
slave->mtd.ecclayout = master->ecclayout;
- slave->mtd.ecc_step_size = master->ecc_step_size;
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -55,6 +55,10 @@ struct erase_info {
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -55,6 +55,10 @@ struct erase_info {