summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>2020-03-29 10:08:26 -0600
committerJens Axboe <axboe@kernel.dk>2020-03-29 10:08:26 -0600
commit654a3667df364f778b9b5bcdfb32e545aceb6a51 (patch)
tree572e92f198f6c62cb0ec17b01b5863cca168d93b /block
parent130879f1ee0e25b0391b8c78b3baac6fe41f4d38 (diff)
downloadlinux-sh-654a3667df364f778b9b5bcdfb32e545aceb6a51.tar.gz
block: return NULL in blk_alloc_queue() on error
This patch fixes follwoing warning: block/blk-core.c: In function ‘blk_alloc_queue’: block/blk-core.c:558:10: warning: returning ‘int’ from a function with return type ‘struct request_queue *’ makes pointer from integer without a cast [-Wint-conversion] return -EINVAL; Fixes: 3d745ea5b095a ("block: simplify queue allocation") Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/blk-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 18b8c09d093e..7e4a1da0715e 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -555,7 +555,7 @@ struct request_queue *blk_alloc_queue(make_request_fn make_request, int node_id)
struct request_queue *q;
if (WARN_ON_ONCE(!make_request))
- return -EINVAL;
+ return NULL;
q = __blk_alloc_queue(node_id);
if (!q)