diff options
Diffstat (limited to 'drivers/mtd/ubi/io.c')
-rw-r--r-- | drivers/mtd/ubi/io.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c index b58714011091..1ea14218de02 100644 --- a/drivers/mtd/ubi/io.c +++ b/drivers/mtd/ubi/io.c | |||
@@ -563,16 +563,15 @@ int ubi_io_mark_bad(const struct ubi_device *ubi, int pnum) | |||
563 | * This function returns zero if the erase counter header is OK, and %1 if | 563 | * This function returns zero if the erase counter header is OK, and %1 if |
564 | * not. | 564 | * not. |
565 | */ | 565 | */ |
566 | static int validate_ec_hdr(struct ubi_device *ubi, | 566 | static int validate_ec_hdr(const struct ubi_device *ubi, |
567 | const struct ubi_ec_hdr *ec_hdr) | 567 | const struct ubi_ec_hdr *ec_hdr) |
568 | { | 568 | { |
569 | long long ec; | 569 | long long ec; |
570 | int vid_hdr_offset, leb_start, image_seq; | 570 | int vid_hdr_offset, leb_start; |
571 | 571 | ||
572 | ec = be64_to_cpu(ec_hdr->ec); | 572 | ec = be64_to_cpu(ec_hdr->ec); |
573 | vid_hdr_offset = be32_to_cpu(ec_hdr->vid_hdr_offset); | 573 | vid_hdr_offset = be32_to_cpu(ec_hdr->vid_hdr_offset); |
574 | leb_start = be32_to_cpu(ec_hdr->data_offset); | 574 | leb_start = be32_to_cpu(ec_hdr->data_offset); |
575 | image_seq = be32_to_cpu(ec_hdr->image_seq); | ||
576 | 575 | ||
577 | if (ec_hdr->version != UBI_VERSION) { | 576 | if (ec_hdr->version != UBI_VERSION) { |
578 | ubi_err("node with incompatible UBI version found: " | 577 | ubi_err("node with incompatible UBI version found: " |
@@ -598,15 +597,6 @@ static int validate_ec_hdr(struct ubi_device *ubi, | |||
598 | goto bad; | 597 | goto bad; |
599 | } | 598 | } |
600 | 599 | ||
601 | if (!ubi->image_seq_set) { | ||
602 | ubi->image_seq = image_seq; | ||
603 | ubi->image_seq_set = 1; | ||
604 | } else if (ubi->image_seq != image_seq) { | ||
605 | ubi_err("bad image sequence number %d, expected %d", | ||
606 | image_seq, ubi->image_seq); | ||
607 | goto bad; | ||
608 | } | ||
609 | |||
610 | return 0; | 600 | return 0; |
611 | 601 | ||
612 | bad: | 602 | bad: |