diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-08-27 02:17:51 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-08-27 02:24:28 +0200 |
| commit | b855192c08fcb14adbc5d3a7cab182022d433cca (patch) | |
| tree | 3a10cafbfbf98cafacf667eb218c71300b351bfa /drivers/mtd/ubi/wl.c | |
| parent | x86, pat: Sanity check remap_pfn_range for RAM region (diff) | |
| parent | x86: Fix an incorrect argument of reserve_bootmem() (diff) | |
| download | linux-b855192c08fcb14adbc5d3a7cab182022d433cca.tar.xz linux-b855192c08fcb14adbc5d3a7cab182022d433cca.zip | |
Merge branch 'x86/urgent' into x86/pat
Reason: Change to is_new_memtype_allowed() in x86/urgent
Resolved semantic conflicts in:
arch/x86/mm/pat.c
arch/x86/mm/ioremap.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'drivers/mtd/ubi/wl.c')
| -rw-r--r-- | drivers/mtd/ubi/wl.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c index 2b2472300610..600c7229d5cf 100644 --- a/drivers/mtd/ubi/wl.c +++ b/drivers/mtd/ubi/wl.c @@ -459,6 +459,14 @@ retry: dbg_wl("PEB %d EC %d", e->pnum, e->ec); prot_queue_add(ubi, e); spin_unlock(&ubi->wl_lock); + + err = ubi_dbg_check_all_ff(ubi, e->pnum, ubi->vid_hdr_aloffset, + ubi->peb_size - ubi->vid_hdr_aloffset); + if (err) { + ubi_err("new PEB %d does not contain all 0xFF bytes", e->pnum); + return err > 0 ? -EINVAL : err; + } + return e->pnum; } |