diff options
| author | Jens Axboe <axboe@fb.com> | 2017-04-25 06:03:14 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-25 06:03:14 +0200 |
| commit | d9fd363a6cbfae24ffaa00ac6fd3ce8e271acaf1 (patch) | |
| tree | 9139831824ebe9cf77d1bf836b558ee2061c0483 /drivers/nvme/target | |
| parent | lightnvm: pblk: fix erase counters on error fail (diff) | |
| parent | Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/... (diff) | |
| download | linux-d9fd363a6cbfae24ffaa00ac6fd3ce8e271acaf1.tar.xz linux-d9fd363a6cbfae24ffaa00ac6fd3ce8e271acaf1.zip | |
Merge branch 'master' into for-4.12/post-merge
Diffstat (limited to 'drivers/nvme/target')
| -rw-r--r-- | drivers/nvme/target/loop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c index 8260ee1f8e48..304f1c87c160 100644 --- a/drivers/nvme/target/loop.c +++ b/drivers/nvme/target/loop.c @@ -405,7 +405,7 @@ static int nvme_loop_configure_admin_queue(struct nvme_loop_ctrl *ctrl) } ctrl->ctrl.sqsize = - min_t(int, NVME_CAP_MQES(ctrl->cap) + 1, ctrl->ctrl.sqsize); + min_t(int, NVME_CAP_MQES(ctrl->cap), ctrl->ctrl.sqsize); error = nvme_enable_ctrl(&ctrl->ctrl, ctrl->cap); if (error) |