diff options
author | Jonas Gorski <jogo@openwrt.org> | 2013-05-19 18:36:15 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2013-05-19 18:36:15 +0000 |
commit | 3c5635a3aa3dd00eb47cf0191588ed64f6d10f29 (patch) | |
tree | 6b6bd393ef7dac1fdb3f9503f6bfc07e09b2ad25 /target/linux/generic/patches-3.10/478-mtd-partial_eraseblock_unlock.patch | |
parent | 8ef2514fb69dce5191f3e967a68663d9baa5f6d0 (diff) | |
download | master-187ad058-3c5635a3aa3dd00eb47cf0191588ed64f6d10f29.tar.gz master-187ad058-3c5635a3aa3dd00eb47cf0191588ed64f6d10f29.tar.bz2 master-187ad058-3c5635a3aa3dd00eb47cf0191588ed64f6d10f29.zip |
kernel: generic: add 3.10-rc1 support
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36663 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 18 |
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) |