Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74641d75 authored by Adrian Hunter's avatar Adrian Hunter Committed by David Woodhouse
Browse files

[MTD] Correct partition failed erase address 



If an erase operation fails, the address at which the
failure occurred is returned by the driver.  The MTD
partition must adjust this address (by subtracting the
partition offset) before returning to the caller.
This was not happening, which caused JFFS2 to mark
the wrong block bad!

Signed-off-by: default avatarAdrian Hunter <ext-adrian.hunter@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent f8a922c7

drivers/mtd/mtdpart.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -200,6 +200,11 @@ static int part_erase (struct mtd_info *mtd, struct erase_info *instr) 
		return -EINVAL;

		return -EINVAL;

	instr->addr += part->offset;

	instr->addr += part->offset;

	ret = part->master->erase(part->master, instr);

	ret = part->master->erase(part->master, instr);

	if (ret) {

		if (instr->fail_addr != 0xffffffff)

			instr->fail_addr -= part->offset;

		instr->addr -= part->offset;

	}

	return ret;

	return ret;

}

}
@@ -560,4 +565,3 @@ EXPORT_SYMBOL_GPL(deregister_mtd_parser); 
MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

MODULE_AUTHOR("Nicolas Pitre <nico@cam.org>");

MODULE_AUTHOR("Nicolas Pitre <nico@cam.org>");

MODULE_DESCRIPTION("Generic support for partitioning of MTD devices");
 
MODULE_DESCRIPTION("Generic support for partitioning of MTD devices");