74d00a8c38
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
19 lines
699 B
Diff
19 lines
699 B
Diff
--- a/drivers/mtd/mtdpart.c
|
|
+++ b/drivers/mtd/mtdpart.c
|
|
@@ -337,7 +337,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)
|