[patch] UBI: block: checking for NULL instead of IS_ERR()

Richard Weinberger richard at nod.at
Thu Feb 12 14:35:01 PST 2015


Am 05.02.2015 um 08:38 schrieb Dan Carpenter:
> 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 at oracle.com>
> 
> diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
> index 995e61c..d0a9349 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);

Applied. Thanks Dan!



More information about the linux-mtd mailing list