diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2012-10-23 12:21:34 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2012-10-23 12:21:34 +0000 |
commit | 648f1d01710c2e9d5bb3e296d9553120e5bbe51e (patch) | |
tree | 413eb23081ae9b34b54a6ee479e5a2bf0085877d /target/linux/generic/patches-3.6/478-mtd-partial_eraseblock_unlock.patch | |
parent | 35c7b0ba8a06d128adf45ca58377299e988d4e84 (diff) | |
download | upstream-648f1d01710c2e9d5bb3e296d9553120e5bbe51e.tar.gz upstream-648f1d01710c2e9d5bb3e296d9553120e5bbe51e.tar.bz2 upstream-648f1d01710c2e9d5bb3e296d9553120e5bbe51e.zip |
[generic]: linux 3.6 support (work in progress)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33897 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6/478-mtd-partial_eraseblock_unlock.patch')
-rw-r--r-- | target/linux/generic/patches-3.6/478-mtd-partial_eraseblock_unlock.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.6/478-mtd-partial_eraseblock_unlock.patch b/target/linux/generic/patches-3.6/478-mtd-partial_eraseblock_unlock.patch new file mode 100644 index 0000000000..d60a428f09 --- /dev/null +++ b/target/linux/generic/patches-3.6/478-mtd-partial_eraseblock_unlock.patch @@ -0,0 +1,18 @@ +--- a/drivers/mtd/mtdpart.c ++++ b/drivers/mtd/mtdpart.c +@@ -356,7 +356,14 @@ static int part_unlock(struct mtd_info * + 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) |