diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
| commit | f20e3b5fe7ead0615309433260b9784d8da0bbbd (patch) | |
| tree | eabb2e47a0355ac4e8024b7087b4e7cb9f324358 /drivers/mtd/mtdpart.c | |
| parent | bcbfe664e7af019e698cef2feb85ac2b4f1ac11d (diff) | |
| parent | f030d7b65e4e6399f23de2a41a58d1b607b6bd89 (diff) | |
Merge branch 'for-rmk' of git://git.android.com/kernel into devel
Diffstat (limited to 'drivers/mtd/mtdpart.c')
| -rw-r--r-- | drivers/mtd/mtdpart.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index 9a06dc93ee0d..3728913fa5fa 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c | |||
| @@ -214,7 +214,7 @@ static int part_erase(struct mtd_info *mtd, struct erase_info *instr) | |||
| 214 | instr->addr += part->offset; | 214 | instr->addr += part->offset; |
| 215 | ret = part->master->erase(part->master, instr); | 215 | ret = part->master->erase(part->master, instr); |
| 216 | if (ret) { | 216 | if (ret) { |
| 217 | if (instr->fail_addr != 0xffffffff) | 217 | if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN) |
| 218 | instr->fail_addr -= part->offset; | 218 | instr->fail_addr -= part->offset; |
| 219 | instr->addr -= part->offset; | 219 | instr->addr -= part->offset; |
| 220 | } | 220 | } |
| @@ -226,7 +226,7 @@ void mtd_erase_callback(struct erase_info *instr) | |||
| 226 | if (instr->mtd->erase == part_erase) { | 226 | if (instr->mtd->erase == part_erase) { |
| 227 | struct mtd_part *part = PART(instr->mtd); | 227 | struct mtd_part *part = PART(instr->mtd); |
| 228 | 228 | ||
| 229 | if (instr->fail_addr != 0xffffffff) | 229 | if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN) |
| 230 | instr->fail_addr -= part->offset; | 230 | instr->fail_addr -= part->offset; |
| 231 | instr->addr -= part->offset; | 231 | instr->addr -= part->offset; |
| 232 | } | 232 | } |