From ba018fd1a5ffc23a1dfeca182967659533de3180 Mon Sep 17 00:00:00 2001 From: Keith Busch Date: Wed, 25 Jul 2012 16:06:38 -0600 Subject: [PATCH] --- yaml --- r: 323247 b: refs/heads/master c: a42ceccef0c43b46ff6bc1b12a7c1076ef243df1 h: refs/heads/master i: 323245: fbe834326159dee088e583b1b8b25bee64e45e4b 323243: f98b5b0f5e877a72fd62db22f58048f505a62ca3 323239: 568695d43bf8c7d3ccdf6de5c8ae61d1813880db 323231: 59e24da63a1af1349dbe25a8c138abfd565d31f7 v: v3 --- [refs] | 2 +- trunk/drivers/block/nvme.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9464440e70c0..815916f253bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50af8baec46a99a9b81a4600c0374f83a5a590a9 +refs/heads/master: a42ceccef0c43b46ff6bc1b12a7c1076ef243df1 diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c index 89935853cb85..7bcd88205a41 100644 --- a/trunk/drivers/block/nvme.c +++ b/trunk/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); }