diff options
author | Jens Axboe <axboe@fb.com> | 2014-11-18 19:43:46 -0700 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2014-11-18 19:43:46 -0700 |
commit | b3521729769ec71567a2e32a38609f87e781e41b (patch) | |
tree | 66a8494968706420c3eb043caa5868702d440d18 /drivers/block/null_blk.c | |
parent | 139768895309c6c1d6913e909e9c9422f81a1640 (diff) | |
parent | fc14f9c1272f62c3e8d01300f52467c0d9af50f9 (diff) | |
download | linux-b3521729769ec71567a2e32a38609f87e781e41b.tar.gz linux-b3521729769ec71567a2e32a38609f87e781e41b.tar.xz |
Merge branch 'master' into for-3.19/drivers
Diffstat (limited to 'drivers/block/null_blk.c')
-rw-r--r-- | drivers/block/null_blk.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c index 8433bc8ead3d..caa61212fdb5 100644 --- a/drivers/block/null_blk.c +++ b/drivers/block/null_blk.c @@ -450,14 +450,10 @@ static int init_driver_queues(struct nullb *nullb) ret = setup_commands(nq); if (ret) - goto err_queue; + return ret; nullb->nr_queues++; } - return 0; -err_queue: - cleanup_queues(nullb); - return ret; } static int null_add_dev(void) @@ -507,7 +503,9 @@ static int null_add_dev(void) goto out_cleanup_queues; } blk_queue_make_request(nullb->q, null_queue_bio); - init_driver_queues(nullb); + rv = init_driver_queues(nullb); + if (rv) + goto out_cleanup_blk_queue; } else { nullb->q = blk_init_queue_node(null_request_fn, &nullb->lock, home_node); if (!nullb->q) { @@ -516,7 +514,9 @@ static int null_add_dev(void) } blk_queue_prep_rq(nullb->q, null_rq_prep_fn); blk_queue_softirq_done(nullb->q, null_softirq_done_fn); - init_driver_queues(nullb); + rv = init_driver_queues(nullb); + if (rv) + goto out_cleanup_blk_queue; } nullb->q->queuedata = nullb; |