1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c
index c071d410488f..33bb1f2b63e4 100644
--- a/drivers/mtd/ubi/attach.c
+++ b/drivers/mtd/ubi/attach.c
@@ -900,10 +900,9 @@ static int scan_peb(struct ubi_device *ubi, struct ubi_attach_info *ai,
                  * number.
                  */
                 image_seq = be32_to_cpu(ech->image_seq);
-                if (!ubi->image_seq && image_seq)
+                if (!ubi->image_seq)
                         ubi->image_seq = image_seq;
-                if (ubi->image_seq && image_seq &&
-                    ubi->image_seq != image_seq) {
+                if (image_seq && ubi->image_seq != image_seq) {
                         ubi_err("bad image sequence number %d in PEB %d, expected %d",
                                 image_seq, pnum, ubi->image_seq);
                         ubi_dump_ec_hdr(ech);
@@ -1417,9 +1416,11 @@ int ubi_attach(struct ubi_device *ubi, int force_scan)
                                 ai = alloc_ai("ubi_aeb_slab_cache2");
                                 if (!ai)
                                         return -ENOMEM;
-                        }
 
-                        err = scan_all(ubi, ai, UBI_FM_MAX_START);
+                                err = scan_all(ubi, ai, 0);
+                        } else {
+                                err = scan_all(ubi, ai, UBI_FM_MAX_START);
+                        }
                 }
         }
 #else