1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/mtd/mtdoops.c b/drivers/mtd/mtdoops.c
index f5b3f91fa1cc..97bb8f6304d4 100644
--- a/drivers/mtd/mtdoops.c
+++ b/drivers/mtd/mtdoops.c
@@ -271,7 +271,7 @@ static void find_next_position(struct mtdoops_context *cxt)
 
                 if (count[0] == 0xffffffff && count[1] == 0xffffffff)
                         mark_page_unused(cxt, page);
-                if (count[0] == 0xffffffff)
+                if (count[0] == 0xffffffff || count[1] != MTDOOPS_KERNMSG_MAGIC)
                         continue;
                 if (maxcount == 0xffffffff) {
                         maxcount = count[0];
@@ -289,14 +289,13 @@ static void find_next_position(struct mtdoops_context *cxt)
                 }
         }
         if (maxcount == 0xffffffff) {
-                cxt->nextpage = 0;
-                cxt->nextcount = 1;
-                schedule_work(&cxt->work_erase);
-                return;
+                cxt->nextpage = cxt->oops_pages - 1;
+                cxt->nextcount = 0;
+        }
+        else {
+                cxt->nextpage = maxpos;
+                cxt->nextcount = maxcount;
         }
-
-        cxt->nextpage = maxpos;
-        cxt->nextcount = maxcount;
 
         mtdoops_inc_counter(cxt);
 }