diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-10 19:15:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-10 19:15:34 -0700 |
| commit | d6be791cbd4d6a96f0ec1c8c44166038c76d1330 (patch) | |
| tree | 2a13a10330a8a13540c119c531b052ac6c27e39c /drivers/mtd/ubi/scan.c | |
| parent | 44c695b13bee558c73a89bc79f6253a4ba637386 (diff) | |
| parent | 83c2099f5e1f0a4621ed4f20fc539069c636a24b (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
* 'linux-next' of git://git.infradead.org/ubi-2.6:
UBI: fix compilation warnings
UBI: fix NOR flash recovery
UBI: nicify image sequence number handling
UBI: add image sequence number to EC header
UBI: remove bogus debugging checks
UBI: add empty eraseblocks verification
Diffstat (limited to 'drivers/mtd/ubi/scan.c')
| -rw-r--r-- | drivers/mtd/ubi/scan.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/mtd/ubi/scan.c b/drivers/mtd/ubi/scan.c index c3d653ba5ca0..f60895ee0aeb 100644 --- a/drivers/mtd/ubi/scan.c +++ b/drivers/mtd/ubi/scan.c @@ -757,6 +757,8 @@ static int process_eb(struct ubi_device *ubi, struct ubi_scan_info *si, si->is_empty = 0; if (!ec_corr) { + int image_seq; + /* Make sure UBI version is OK */ if (ech->version != UBI_VERSION) { ubi_err("this UBI version is %d, image version is %d", @@ -778,6 +780,18 @@ static int process_eb(struct ubi_device *ubi, struct ubi_scan_info *si, ubi_dbg_dump_ec_hdr(ech); return -EINVAL; } + + image_seq = be32_to_cpu(ech->ec); + if (!si->image_seq_set) { + ubi->image_seq = image_seq; + si->image_seq_set = 1; + } else if (ubi->image_seq != image_seq) { + ubi_err("bad image sequence number %d in PEB %d, " + "expected %d", image_seq, pnum, ubi->image_seq); + ubi_dbg_dump_ec_hdr(ech); + return -EINVAL; + } + } /* OK, we've done with the EC header, let's look at the VID header */ |