From: Christoph Hellwig hch@lst.de
[ Upstream commit c76b8308e4c9148e44e0c7e086ab6d8b4bb10162 ]
nvme_shutdown_ctrl already shuts the controller down, there is no need to also call nvme_disable_ctrl for the shutdown case.
Signed-off-by: Christoph Hellwig hch@lst.de Reviewed-by: Keith Busch kbusch@kernel.org Reviewed-by: Eric Curtin ecurtin@redhat.com Reviewed-by: Sagi Grimberg sagi@grimberg.me Reviewed-by: Hector Martin marcan@marcan.st Signed-off-by: Sasha Levin sashal@kernel.org --- drivers/nvme/host/apple.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/nvme/host/apple.c b/drivers/nvme/host/apple.c index 262d2b60ac6dd..92c70c4b2f6ec 100644 --- a/drivers/nvme/host/apple.c +++ b/drivers/nvme/host/apple.c @@ -831,7 +831,8 @@ static void apple_nvme_disable(struct apple_nvme *anv, bool shutdown)
if (shutdown) nvme_shutdown_ctrl(&anv->ctrl); - nvme_disable_ctrl(&anv->ctrl); + else + nvme_disable_ctrl(&anv->ctrl); }
WRITE_ONCE(anv->ioq.enabled, false);