diff options
author | Keith Busch <keith.busch@intel.com> | 2012-07-25 18:06:38 -0400 |
---|---|---|
committer | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2012-07-26 12:46:36 -0400 |
commit | a42ceccef0c43b46ff6bc1b12a7c1076ef243df1 (patch) | |
tree | ce08ecbee746def89e9ea95fbbd917066057efa8 /drivers/block | |
parent | 50af8baec46a99a9b81a4600c0374f83a5a590a9 (diff) |
NVMe: use namespace id for nvme_get_features
The specification does not provide a use for command dword11 in the NVMe
Get Features command, but does use the NSID for some features.
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/nvme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c index 89935853cb85..7bcd88205a41 100644 --- a/drivers/block/nvme.c +++ b/drivers/block/nvme.c | |||
@@ -840,15 +840,15 @@ static int nvme_identify(struct nvme_dev *dev, unsigned nsid, unsigned cns, | |||
840 | } | 840 | } |
841 | 841 | ||
842 | static int nvme_get_features(struct nvme_dev *dev, unsigned fid, | 842 | static int nvme_get_features(struct nvme_dev *dev, unsigned fid, |
843 | unsigned dword11, dma_addr_t dma_addr) | 843 | unsigned nsid, dma_addr_t dma_addr) |
844 | { | 844 | { |
845 | struct nvme_command c; | 845 | struct nvme_command c; |
846 | 846 | ||
847 | memset(&c, 0, sizeof(c)); | 847 | memset(&c, 0, sizeof(c)); |
848 | c.features.opcode = nvme_admin_get_features; | 848 | c.features.opcode = nvme_admin_get_features; |
849 | c.features.nsid = cpu_to_le32(nsid); | ||
849 | c.features.prp1 = cpu_to_le64(dma_addr); | 850 | c.features.prp1 = cpu_to_le64(dma_addr); |
850 | c.features.fid = cpu_to_le32(fid); | 851 | c.features.fid = cpu_to_le32(fid); |
851 | c.features.dword11 = cpu_to_le32(dword11); | ||
852 | 852 | ||
853 | return nvme_submit_admin_cmd(dev, &c, NULL); | 853 | return nvme_submit_admin_cmd(dev, &c, NULL); |
854 | } | 854 | } |