summaryrefslogtreecommitdiffstats
path: root/drivers/nvme
diff options
context:
space:
mode:
authorKeith Busch <keith.busch@intel.com>2019-05-17 10:08:19 -0600
committerKeith Busch <keith.busch@intel.com>2019-05-17 11:05:35 -0600
commit6fa0321a96043b5a983bbefa785859d664645840 (patch)
tree1e68adbfe6518f09a580bc264bcd049dcdfcb6d2 /drivers/nvme
parentd6135c3a1ec0cddda7b8b8e1b5b4abeeafd98289 (diff)
downloadlinux-stable-6fa0321a96043b5a983bbefa785859d664645840.tar.gz
linux-stable-6fa0321a96043b5a983bbefa785859d664645840.tar.bz2
linux-stable-6fa0321a96043b5a983bbefa785859d664645840.zip
nvme: Fix known effects
We're trying to append known effects to the ones reported in the controller's log. The original patch accomplished this, but something went wrong when patch was merged causing the effects log to override the known effects. Link: http://lists.infradead.org/pipermail/linux-nvme/2019-May/023710.html Fixes: f4524cc45626 ("nvme-pci: add known admin effects to augument admin effects log page") Cc: Maxim Levitsky <mlevitsk@redhat.com> Signed-off-by: Keith Busch <keith.busch@intel.com>
Diffstat (limited to 'drivers/nvme')
-rw-r--r--drivers/nvme/host/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index f6879e417386..308b9ce820cd 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1257,9 +1257,9 @@ static u32 nvme_passthru_start(struct nvme_ctrl *ctrl, struct nvme_ns *ns,
return 0;
}
- effects |= nvme_known_admin_effects(opcode);
if (ctrl->effects)
effects = le32_to_cpu(ctrl->effects->acs[opcode]);
+ effects |= nvme_known_admin_effects(opcode);
/*
* For simplicity, IO to all namespaces is quiesced even if the command