From 8168b9bba6a88fe8a81be5b5f0937faeb3f6775d Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 5 Feb 2015 10:38:19 +0300 Subject: [PATCH] UBI: block: Fix checking for NULL instead of IS_ERR() We recently switched from allocating ->rq using blk_init_queue() to use blk_mq_init_queue() so we need to update the error handling to check for IS_ERR() instead of NULL. Fixes: ff1f48ee3bb3 ('UBI: Block: Add blk-mq support') Signed-off-by: Dan Carpenter Signed-off-by: Richard Weinberger --- drivers/mtd/ubi/block.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c index d82c63ae7c21..db2c05b6fe7f 100644 --- a/drivers/mtd/ubi/block.c +++ b/drivers/mtd/ubi/block.c @@ -409,9 +409,9 @@ int ubiblock_create(struct ubi_volume_info *vi) } dev->rq = blk_mq_init_queue(&dev->tag_set); - if (!dev->rq) { + if (IS_ERR(dev->rq)) { dev_err(disk_to_dev(gd), "blk_mq_init_queue failed"); - ret = -ENODEV; + ret = PTR_ERR(dev->rq); goto out_free_tags; } blk_queue_max_segments(dev->rq, UBI_MAX_SG_COUNT); -- 2.20.1