Commit ad463515 authored by Boris Brezillon's avatar Boris Brezillon

mtd: Make sure mtd->erasesize is valid even if the partition is of size 0

Commit 33f45c44 ("mtd: Do not allow MTD devices with inconsistent
erase properties") introduced a check to make sure ->erasesize and
->_erase values are consistent with the MTD_NO_ERASE flag.
This patch did not take the 0 bytes partition case into account which
can happen when the defined partition is outside the flash device memory
range. Fix that by setting the partition erasesize to the parent
erasesize.

Fixes: 33f45c44 ("mtd: Do not allow MTD devices with inconsistent erase properties")
Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Cc: <stable@vger.kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarBoris Brezillon <bbrezillon@kernel.org>
Tested-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
parent bda2ab56
...@@ -480,6 +480,10 @@ static struct mtd_part *allocate_partition(struct mtd_info *parent, ...@@ -480,6 +480,10 @@ static struct mtd_part *allocate_partition(struct mtd_info *parent,
/* let's register it anyway to preserve ordering */ /* let's register it anyway to preserve ordering */
slave->offset = 0; slave->offset = 0;
slave->mtd.size = 0; slave->mtd.size = 0;
/* Initialize ->erasesize to make add_mtd_device() happy. */
slave->mtd.erasesize = parent->erasesize;
printk(KERN_ERR"mtd: partition \"%s\" is out of reach -- disabled\n", printk(KERN_ERR"mtd: partition \"%s\" is out of reach -- disabled\n",
part->name); part->name);
goto out_register; goto out_register;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment