1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index 02317c1c0238..0f3425dac910 100644
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -671,6 +671,8 @@ static struct ubi_wl_entry *get_peb_for_wl(struct ubi_device *ubi)
 
         e = find_wl_entry(ubi, &ubi->free, WL_FREE_MAX_DIFF);
         self_check_in_wl_tree(ubi, e, &ubi->free);
+        ubi->free_count--;
+        ubi_assert(ubi->free_count >= 0);
         rb_erase(&e->u.rb, &ubi->free);
 
         return e;
@@ -684,6 +686,9 @@ int ubi_wl_get_peb(struct ubi_device *ubi)
         peb = __wl_get_peb(ubi);
         spin_unlock(&ubi->wl_lock);
 
+        if (peb < 0)
+                return peb;
+
         err = ubi_self_check_all_ff(ubi, peb, ubi->vid_hdr_aloffset,
                                     ubi->peb_size - ubi->vid_hdr_aloffset);
         if (err) {
@@ -1068,6 +1073,7 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk,
 
                         /* Give the unused PEB back */
                         wl_tree_add(e2, &ubi->free);
+                        ubi->free_count++;
                         goto out_cancel;
                 }
                 self_check_in_wl_tree(ubi, e1, &ubi->used);