From 5b375dfcfb0361ecbf7dbc3a55c7f7ae5258bdf9 Mon Sep 17 00:00:00 2001 From: Keith Busch Date: Fri, 21 Sep 2012 10:52:13 -0600 Subject: [PATCH] --- yaml --- r: 361681 b: refs/heads/master c: 08df1e05657fc6712e520e7c09cc6c86160ceb35 h: refs/heads/master i: 361679: e0f0f1274efd77ffae27d09ba010a96280e93f51 v: v3 --- [refs] | 2 +- trunk/drivers/block/nvme.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d0b0ca3bc925..52c4d50044ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4f117f64baf8840d22266d518227b2a186d294b +refs/heads/master: 08df1e05657fc6712e520e7c09cc6c86160ceb35 diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c index 47c860454289..c1d5444f0cb3 100644 --- a/trunk/drivers/block/nvme.c +++ b/trunk/drivers/block/nvme.c @@ -838,8 +838,8 @@ static int nvme_identify(struct nvme_dev *dev, unsigned nsid, unsigned cns, return nvme_submit_admin_cmd(dev, &c, NULL); } -static int nvme_get_features(struct nvme_dev *dev, unsigned fid, - unsigned nsid, dma_addr_t dma_addr) +static int nvme_get_features(struct nvme_dev *dev, unsigned fid, unsigned nsid, + dma_addr_t dma_addr, u32 *result) { struct nvme_command c; @@ -849,7 +849,7 @@ static int nvme_get_features(struct nvme_dev *dev, unsigned fid, c.features.prp1 = cpu_to_le64(dma_addr); c.features.fid = cpu_to_le32(fid); - return nvme_submit_admin_cmd(dev, &c, NULL); + return nvme_submit_admin_cmd(dev, &c, result); } static int nvme_set_features(struct nvme_dev *dev, unsigned fid, @@ -1535,7 +1535,7 @@ static int __devinit nvme_dev_add(struct nvme_dev *dev) continue; res = nvme_get_features(dev, NVME_FEAT_LBA_RANGE, i, - dma_addr + 4096); + dma_addr + 4096, NULL); if (res) continue;