diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2014-03-07 11:27:00 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2014-03-07 11:27:00 +0000 |
| commit | 074af75668dd491042b07a26059927da38f13663 (patch) | |
| tree | 58362fbaa56de52bda6c4aafc825d5bf5c40ec09 /target/linux/generic/patches-3.14/412-mtd-partial_eraseblock_unlock.patch | |
| parent | 96fa58bafd6b311a9a3686b704bf8074905c4bea (diff) | |
| download | upstream-074af75668dd491042b07a26059927da38f13663.tar.gz upstream-074af75668dd491042b07a26059927da38f13663.tar.bz2 upstream-074af75668dd491042b07a26059927da38f13663.zip | |
add preliminary 3.14 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 39789
Diffstat (limited to 'target/linux/generic/patches-3.14/412-mtd-partial_eraseblock_unlock.patch')
| -rw-r--r-- | target/linux/generic/patches-3.14/412-mtd-partial_eraseblock_unlock.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.14/412-mtd-partial_eraseblock_unlock.patch b/target/linux/generic/patches-3.14/412-mtd-partial_eraseblock_unlock.patch new file mode 100644 index 0000000000..134f65715e --- /dev/null +++ b/target/linux/generic/patches-3.14/412-mtd-partial_eraseblock_unlock.patch @@ -0,0 +1,18 @@ +--- a/drivers/mtd/mtdpart.c ++++ b/drivers/mtd/mtdpart.c +@@ -331,7 +331,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) |