1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/mtd/ubi/fastmap-wl.c b/drivers/mtd/ubi/fastmap-wl.c
index 30d3999dddba..4f0bd6b4422a 100644
--- a/drivers/mtd/ubi/fastmap-wl.c
+++ b/drivers/mtd/ubi/fastmap-wl.c
@@ -262,6 +262,8 @@ static struct ubi_wl_entry *get_peb_for_wl(struct ubi_device *ubi)
         struct ubi_fm_pool *pool = &ubi->fm_wl_pool;
         int pnum;
 
+        ubi_assert(rwsem_is_locked(&ubi->fm_eba_sem));
+
         if (pool->used == pool->size) {
                 /* We cannot update the fastmap here because this
                  * function is called in atomic context.
@@ -303,7 +305,7 @@ int ubi_ensure_anchor_pebs(struct ubi_device *ubi)
 
         wrk->anchor = 1;
         wrk->func = &wear_leveling_worker;
-        schedule_ubi_work(ubi, wrk);
+        __schedule_ubi_work(ubi, wrk);
         return 0;
 }
 
@@ -344,7 +346,7 @@ int ubi_wl_put_fm_peb(struct ubi_device *ubi, struct ubi_wl_entry *fm_e,
         spin_unlock(&ubi->wl_lock);
 
         vol_id = lnum ? UBI_FM_DATA_VOLUME_ID : UBI_FM_SB_VOLUME_ID;
-        return schedule_erase(ubi, e, vol_id, lnum, torture);
+        return schedule_erase(ubi, e, vol_id, lnum, torture, true);
 }
 
 /**