diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2013-10-24 13:50:11 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2013-10-24 13:50:11 +0000 |
| commit | bdc2e671912c3737ec65454cc7a5ed91213f7e01 (patch) | |
| tree | 4613cca2c570d5eefc520620ba3bac85f7015a4b /target/linux/generic/patches-3.12/412-mtd-partial_eraseblock_unlock.patch | |
| parent | bf6998b89de06eae7f3fb8cecd43482d6cb15afb (diff) | |
| download | upstream-bdc2e671912c3737ec65454cc7a5ed91213f7e01.tar.gz upstream-bdc2e671912c3737ec65454cc7a5ed91213f7e01.tar.bz2 upstream-bdc2e671912c3737ec65454cc7a5ed91213f7e01.zip | |
[generic:] preliminary 3.12 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38528 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.12/412-mtd-partial_eraseblock_unlock.patch')
| -rw-r--r-- | target/linux/generic/patches-3.12/412-mtd-partial_eraseblock_unlock.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.12/412-mtd-partial_eraseblock_unlock.patch b/target/linux/generic/patches-3.12/412-mtd-partial_eraseblock_unlock.patch new file mode 100644 index 0000000000..87c8257fe1 --- /dev/null +++ b/target/linux/generic/patches-3.12/412-mtd-partial_eraseblock_unlock.patch @@ -0,0 +1,18 @@ +--- a/drivers/mtd/mtdpart.c ++++ b/drivers/mtd/mtdpart.c +@@ -332,7 +332,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) |