diff options
| author | Adrian Hunter <ext-adrian.hunter@nokia.com> | 2007-03-08 13:20:12 +0300 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-03-08 13:45:04 +0300 |
| commit | 74641d75275936796d239f828b80cb030e9f9b0a (patch) | |
| tree | 8364efdc01c453d429db53e24cf2655e69d1f7d5 /drivers/mtd | |
| parent | f8a922c7bb4d93bd84b7371a8e2571e667d2afb5 (diff) | |
| download | linux-74641d75275936796d239f828b80cb030e9f9b0a.tar.xz | |
[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: Adrian Hunter <ext-adrian.hunter@nokia.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/mtdpart.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index 01e4afff42b0..1af989023c66 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c @@ -200,6 +200,11 @@ static int part_erase (struct mtd_info *mtd, struct erase_info *instr) return -EINVAL; instr->addr += part->offset; 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; } @@ -560,4 +565,3 @@ EXPORT_SYMBOL_GPL(deregister_mtd_parser); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Nicolas Pitre <nico@cam.org>"); MODULE_DESCRIPTION("Generic support for partitioning of MTD devices"); - |