Merge branch 'for-4.16/dax' into libnvdimm-for-next

[linux-2.6-block.git] / drivers / nvdimm / btt.c

diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c
index c586bcdb5190b1c9f6447cb9a380568a03840988..2ef544f10ec8a3b2016bac8e9bc38475113eb5ef 100644 (file)
--- a/drivers/nvdimm/btt.c
+++ b/drivers/nvdimm/btt.c
@@ -753,6 +753,7 @@ static struct arena_info *alloc_arena(struct btt *btt, size_t size,
                return NULL;
        arena->nd_btt = btt->nd_btt;
        arena->sector_size = btt->sector_size;
+       mutex_init(&arena->err_lock);
 
        if (!size)
                return arena;
@@ -891,7 +892,6 @@ static int discover_arenas(struct btt *btt)
                        goto out;
                }
 
-               mutex_init(&arena->err_lock);
                ret = btt_freelist_init(arena);
                if (ret)
                        goto out;