ramips: fix cd-poll sd card remove randomly

[openwrt/openwrt.git] / target / linux / generic / patches-4.9 / 412-mtd-partial_eraseblock_unlock.patch

diff --git a/target/linux/generic/patches-4.9/412-mtd-partial_eraseblock_unlock.patch b/target/linux/generic/patches-4.9/412-mtd-partial_eraseblock_unlock.patch
index e7c91c69d1f468525a8bfbd4e6007ee531e9c68e..da4a902ffabbe6602e1d91cae8133c4367d76788 100644 (file)
--- a/target/linux/generic/patches-4.9/412-mtd-partial_eraseblock_unlock.patch
+++ b/target/linux/generic/patches-4.9/412-mtd-partial_eraseblock_unlock.patch
@@ -1,20 +1,20 @@
 --- a/drivers/mtd/mtdpart.c
 +++ b/drivers/mtd/mtdpart.c
-@@ -337,7 +337,16 @@ static int part_lock(struct mtd_info *mt
+@@ -343,7 +343,16 @@ 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 = mtd_to_part(mtd);
--      return part->master->_unlock(part->master, ofs + part->offset, len);
+-      return part->parent->_unlock(part->parent, 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);
++              len = (mtd_div_by_eb(len, part->parent) + 1) * part->parent->erasesize;
++              ofs &= ~(part->parent->erasesize - 1);
 +      }
 +
-+      return part->master->_unlock(part->master, ofs, len);
++      return part->parent->_unlock(part->parent, ofs, len);
  }
  
  static int part_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)