1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index 42c684cf3688..0696e36b0539 100644
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -795,7 +795,10 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk,
                         protect = 1;
                         goto out_not_moved;
                 }
-
+                if (err == MOVE_RETRY) {
+                        scrubbing = 1;
+                        goto out_not_moved;
+                }
                 if (err == MOVE_CANCEL_BITFLIPS || err == MOVE_TARGET_WR_ERR ||
                     err == MOVE_TARGET_RD_ERR) {
                         /*
@@ -1049,7 +1052,6 @@ static int erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk,
 
         ubi_err("failed to erase PEB %d, error %d", pnum, err);
         kfree(wl_wrk);
-        kmem_cache_free(ubi_wl_entry_slab, e);
 
         if (err == -EINTR || err == -ENOMEM || err == -EAGAIN ||
             err == -EBUSY) {
@@ -1062,14 +1064,16 @@ static int erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk,
                         goto out_ro;
                 }
                 return err;
-        } else if (err != -EIO) {
+        }
+
+        kmem_cache_free(ubi_wl_entry_slab, e);
+        if (err != -EIO)
                 /*
                  * If this is not %-EIO, we have no idea what to do. Scheduling
                  * this physical eraseblock for erasure again would cause
                  * errors again and again. Well, lets switch to R/O mode.
                  */
                 goto out_ro;
-        }
 
         /* It is %-EIO, the PEB went bad */