diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-08-02 09:59:20 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-08-02 09:59:20 +0200 |
commit | 16e0e6a83b778284ae9b3a57003eeea8d8090b55 (patch) | |
tree | 42bf9a711c59549294b2f2125978f5a7095e16c2 /drivers/nvme/host/fc.c | |
parent | Merge tag 'perf-core-for-mingo-4.19-20180725' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core (diff) | |
parent | Merge tag 'perf-urgent-for-mingo-4.18-20180730' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (diff) | |
download | linux-dev-16e0e6a83b778284ae9b3a57003eeea8d8090b55.tar.xz linux-dev-16e0e6a83b778284ae9b3a57003eeea8d8090b55.zip |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/nvme/host/fc.c')
-rw-r--r-- | drivers/nvme/host/fc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index 41d45a1b5c62..9bac912173ba 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -2272,7 +2272,7 @@ nvme_fc_queue_rq(struct blk_mq_hw_ctx *hctx, if (ctrl->rport->remoteport.port_state != FC_OBJSTATE_ONLINE || !nvmf_check_ready(&queue->ctrl->ctrl, rq, queue_ready)) - return nvmf_fail_nonready_command(rq); + return nvmf_fail_nonready_command(&queue->ctrl->ctrl, rq); ret = nvme_setup_cmd(ns, rq, sqe); if (ret) |