path: root/drivers/nvme
diff options
authorChristoph Hellwig <>2021-04-09 11:46:12 +0200
committerChristoph Hellwig <>2021-04-21 19:13:16 +0200
commit53fe2a30bc168db9700e00206d991ff934973cf1 (patch)
treebf6faf3e9abf3a2ee8275a5a265f02583dd22cea /drivers/nvme
parent74c22990f08c9f922f775939a4ebc814ca2c49eb (diff)
nvme: do not try to reconfigure APST when the controller is not live
Do not call nvme_configure_apst when the controller is not live, given that nvme_configure_apst will fail due the lack of an admin queue when the controller is being torn down and nvme_set_latency_tolerance is called from dev_pm_qos_hide_latency_tolerance. Fixes: 510a405d945b("nvme: fix memory leak for power latency tolerance") Reported-by: Peng Liu <> Signed-off-by: Christoph Hellwig <> Reviewed-by: Keith Busch <>
Diffstat (limited to 'drivers/nvme')
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index d6fd44774e9f..11d343c420b6 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2321,7 +2321,8 @@ static void nvme_set_latency_tolerance(struct device *dev, s32 val)
if (ctrl->ps_max_latency_us != latency) {
ctrl->ps_max_latency_us = latency;
- nvme_configure_apst(ctrl);
+ if (ctrl->state == NVME_CTRL_LIVE)
+ nvme_configure_apst(ctrl);