---

yaml --- r: 323247 b: refs/heads/master c: a42cecc h: refs/heads/master i: 323245: fbe8343 323243: f98b5b0 323239: 568695d 323231: 59e24da v: v3
git-mirror · Jul 26, 2012 · ba018fd · ba018fd
1 parent 4cf4ebf
commit ba018fd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);
 }