kernel: fix compile error with gcc-4.8 and kernel 3.3
[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.3 / 478-mtd-partial_eraseblock_unlock.patch
1 --- a/drivers/mtd/mtdpart.c
2 +++ b/drivers/mtd/mtdpart.c
3 @@ -356,7 +356,14 @@ static int part_unlock(struct mtd_info *
4 struct mtd_part *part = PART(mtd);
5 if ((len + ofs) > mtd->size)
6 return -EINVAL;
7 - return mtd_unlock(part->master, ofs + part->offset, len);
8 +
9 + ofs += part->offset;
10 + if (mtd->flags & MTD_ERASE_PARTIAL) {
11 + /* round up len to next erasesize and round down offset to prev block */
12 + len = (mtd_div_by_eb(len, part->master) + 1) * part->master->erasesize;
13 + ofs &= ~(part->master->erasesize - 1);
14 + }
15 + return mtd_unlock(part->master, ofs, len);
16 }
17
18 static int part_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)