diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2015-02-05 02:38:19 -0500 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2015-02-12 17:33:32 -0500 |
commit | 8168b9bba6a88fe8a81be5b5f0937faeb3f6775d (patch) | |
tree | 350b4b62141da21c67318bcc92372b8e4997aa39 | |
parent | 1440061be128180a3846480d8b8bd24233edcd2f (diff) |
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 <dan.carpenter@oracle.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
-rw-r--r-- | drivers/mtd/ubi/block.c | 4 |
1 files 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) | |||
409 | } | 409 | } |
410 | 410 | ||
411 | dev->rq = blk_mq_init_queue(&dev->tag_set); | 411 | dev->rq = blk_mq_init_queue(&dev->tag_set); |
412 | if (!dev->rq) { | 412 | if (IS_ERR(dev->rq)) { |
413 | dev_err(disk_to_dev(gd), "blk_mq_init_queue failed"); | 413 | dev_err(disk_to_dev(gd), "blk_mq_init_queue failed"); |
414 | ret = -ENODEV; | 414 | ret = PTR_ERR(dev->rq); |
415 | goto out_free_tags; | 415 | goto out_free_tags; |
416 | } | 416 | } |
417 | blk_queue_max_segments(dev->rq, UBI_MAX_SG_COUNT); | 417 | blk_queue_max_segments(dev->rq, UBI_MAX_SG_COUNT); |