]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
UBI: block: Fix checking for NULL instead of IS_ERR()
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 5 Feb 2015 07:38:19 +0000 (10:38 +0300)
committerRichard Weinberger <richard@nod.at>
Thu, 12 Feb 2015 22:33:32 +0000 (23:33 +0100)
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>
drivers/mtd/ubi/block.c

index d82c63ae7c21cd1d3ef9288c57bc87b057a4811f..db2c05b6fe7facc9f07a565d40ad6ee507e3da6e 100644 (file)
@@ -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);