summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-3.7/478-mtd-partial_eraseblock_unlock.patch
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-11-18 18:52:38 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-11-18 18:52:38 +0000
commita50e0e707635e05dbf60a59fc0de75c141258c6d (patch)
tree86525769ccc1e76c33de9d10b51d14bdc0e1c8f7 /target/linux/generic/patches-3.7/478-mtd-partial_eraseblock_unlock.patch
parent1f8d59a46a16000018430935732e9d319e6fd3f1 (diff)
[generic]: add 3.7-rc6 support (patch 820 still has to be fixed)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34247 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.7/478-mtd-partial_eraseblock_unlock.patch')
-rw-r--r--target/linux/generic/patches-3.7/478-mtd-partial_eraseblock_unlock.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.7/478-mtd-partial_eraseblock_unlock.patch b/target/linux/generic/patches-3.7/478-mtd-partial_eraseblock_unlock.patch
new file mode 100644
index 0000000000..0fc4154fa6
--- /dev/null
+++ b/target/linux/generic/patches-3.7/478-mtd-partial_eraseblock_unlock.patch
@@ -0,0 +1,18 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -330,7 +330,14 @@ static int part_lock(struct mtd_info *mt
+ static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
+ {
+ struct mtd_part *part = PART(mtd);
+- return part->master->_unlock(part->master, ofs + part->offset, len);
++
++ ofs += part->offset;
++ if (mtd->flags & MTD_ERASE_PARTIAL) {
++ /* round up len to next erasesize and round down offset to prev block */
++ len = (mtd_div_by_eb(len, part->master) + 1) * part->master->erasesize;
++ ofs &= ~(part->master->erasesize - 1);
++ }
++ return part->master->_unlock(part->master, ofs, len);
+ }
+
+ static int part_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)