diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-24 12:48:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-24 12:48:46 +0200 |
| commit | 8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516 (patch) | |
| tree | d535f46a917e14e90deccb29ad00aac016ad18dd /drivers/mtd/mtdconcat.c | |
| parent | 4ce72a2c063a7fa8e42a9435440ae3364115a58d (diff) | |
| parent | 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 (diff) | |
Merge commit 'v2.6.28-rc1' into sched/urgent
Diffstat (limited to 'drivers/mtd/mtdconcat.c')
| -rw-r--r-- | drivers/mtd/mtdconcat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c index 2972a5edb73..789842d0e6f 100644 --- a/drivers/mtd/mtdconcat.c +++ b/drivers/mtd/mtdconcat.c @@ -444,7 +444,7 @@ static int concat_erase(struct mtd_info *mtd, struct erase_info *instr) return -EINVAL; } - instr->fail_addr = 0xffffffff; + instr->fail_addr = MTD_FAIL_ADDR_UNKNOWN; /* make a local copy of instr to avoid modifying the caller's struct */ erase = kmalloc(sizeof (struct erase_info), GFP_KERNEL); @@ -493,7 +493,7 @@ static int concat_erase(struct mtd_info *mtd, struct erase_info *instr) /* sanity check: should never happen since * block alignment has been checked above */ BUG_ON(err == -EINVAL); - if (erase->fail_addr != 0xffffffff) + if (erase->fail_addr != MTD_FAIL_ADDR_UNKNOWN) instr->fail_addr = erase->fail_addr + offset; break; } |