mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 15:02:32 +00:00
304c3411ba
In old days mtd_add_partition was checking for partitions overlapping
which was breaking our splitting feature. We had to modify this function
by adding an extra bool dup_check parameter. Upstream commit:
3a434f66e6da ("mtd: part: Remove partition overlap checks")
removed that check so we don't need our modification anymore.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 47748
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)
|