From 8363b679939a2c51a9279ea9e6232db40de08ae0 Mon Sep 17 00:00:00 2001 From: Michal Mielewczyk Date: Tue, 7 Jul 2020 06:57:17 -0400 Subject: [PATCH] cas_disk: handle allocation error properly In case of error `blk_mq_init_queue()` does not return NULL, but `ERR_PTR(error_code)` instead. `IS_ERR_OR_NULL()` should be used to check if `blk_mq_init_queue()` actually failed. Signed-off-by: Michal Mielewczyk --- modules/cas_disk/exp_obj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/cas_disk/exp_obj.c b/modules/cas_disk/exp_obj.c index ad856b1..a4d2ebe 100644 --- a/modules/cas_disk/exp_obj.c +++ b/modules/cas_disk/exp_obj.c @@ -557,8 +557,8 @@ int casdsk_exp_obj_create(struct casdsk_disk *dsk, const char *dev_name, } queue = blk_mq_init_queue(&dsk->tag_set); - if (!queue) { - result = -ENOMEM; + if (IS_ERR_OR_NULL(queue)) { + result = queue ? PTR_ERR(queue) : -ENOMEM; goto error_init_queue; }