diff options
author | Christoph Hellwig <hch@lst.de> | 2017-06-12 18:21:19 +0200 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2017-06-15 15:48:45 +0200 |
commit | 39bdc5901f2525de3afab8a30b7acc04f6ce41c3 (patch) | |
tree | 018403ac30e222a2b2ae72e1f3909c70dbf3e9e5 /drivers/nvme | |
parent | d86c4d8ef31b3d99c681c859cb4e936dafc2d7a4 (diff) | |
download | linux-39bdc5901f2525de3afab8a30b7acc04f6ce41c3.tar.bz2 |
nvme: no need to wait for the reset when keepalive fails
We don't need to wait for the reset from the delayed work item that
is kicked off when we don't get a keepalive.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reported-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Diffstat (limited to 'drivers/nvme')
-rw-r--r-- | drivers/nvme/host/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index f1b78cc20695..73342b74d3bf 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -624,7 +624,7 @@ static void nvme_keep_alive_work(struct work_struct *work) if (nvme_keep_alive(ctrl)) { /* allocation failure, reset the controller */ dev_err(ctrl->device, "keep-alive failed\n"); - nvme_reset_ctrl_sync(ctrl); + nvme_reset_ctrl(ctrl); return; } } |