aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10/478-mtd-partial_eraseblock_unlock.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-05-19 18:36:15 +0000
committerJonas Gorski <jogo@openwrt.org>2013-05-19 18:36:15 +0000
commitc0435a971e9c21ebf694b221717e7a73f12662ec (patch)
tree6daa92bd257c9376af180e7bb3649dca91589812 /target/linux/generic/patches-3.10/478-mtd-partial_eraseblock_unlock.patch
parent87203c404996884334a9584fce0d8a251bf9fb43 (diff)
downloadupstream-c0435a971e9c21ebf694b221717e7a73f12662ec.tar.gz
upstream-c0435a971e9c21ebf694b221717e7a73f12662ec.tar.bz2
upstream-c0435a971e9c21ebf694b221717e7a73f12662ec.zip
kernel: generic: add 3.10-rc1 support
Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 36663
Diffstat (limited to 'target/linux/generic/patches-3.10/478-mtd-partial_eraseblock_unlock.patch')
-rw-r--r--target/linux/generic/patches-3.10/478-mtd-partial_eraseblock_unlock.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.10/478-mtd-partial_eraseblock_unlock.patch b/target/linux/generic/patches-3.10/478-mtd-partial_eraseblock_unlock.patch
new file mode 100644
index 0000000000..0fc4154fa6
--- /dev/null
+++ b/target/linux/generic/patches-3.10/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)