diff options
| author | Keith Busch <keith.busch@intel.com> | 2012-07-26 00:06:38 +0200 |
|---|---|---|
| committer | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2012-07-26 18:46:36 +0200 |
| commit | a42ceccef0c43b46ff6bc1b12a7c1076ef243df1 (patch) | |
| tree | ce08ecbee746def89e9ea95fbbd917066057efa8 /drivers | |
| parent | NVMe: replace nvme_ns with nvme_dev for user admin (diff) | |
| download | linux-a42ceccef0c43b46ff6bc1b12a7c1076ef243df1.tar.xz linux-a42ceccef0c43b46ff6bc1b12a7c1076ef243df1.zip | |
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')
| -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, } static int nvme_get_features(struct nvme_dev *dev, unsigned fid, - unsigned dword11, dma_addr_t dma_addr) + unsigned nsid, dma_addr_t dma_addr) { struct nvme_command c; memset(&c, 0, sizeof(c)); c.features.opcode = nvme_admin_get_features; + c.features.nsid = cpu_to_le32(nsid); c.features.prp1 = cpu_to_le64(dma_addr); c.features.fid = cpu_to_le32(fid); - c.features.dword11 = cpu_to_le32(dword11); return nvme_submit_admin_cmd(dev, &c, NULL); } |