From 1866deb46e6334bca3754a74925d004e4d2c65a3 Mon Sep 17 00:00:00 2001
From: Matthew Wilcox <matthew.r.wilcox@intel.com>
Date: Tue, 1 Feb 2011 16:23:39 -0500
Subject: [PATCH] --- yaml --- r: 286238 b: refs/heads/master c:
 2930353f9f2b9e4629e935acd970cb73c1171229 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/block/nvme.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b19349136b78..eb314e0139c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f64d3365a3e5cb46e69db7e2c82a7cb9a5bed1b8
+refs/heads/master: 2930353f9f2b9e4629e935acd970cb73c1171229
diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c
index 128fd70031a9..46f872021369 100644
--- a/trunk/drivers/block/nvme.c
+++ b/trunk/drivers/block/nvme.c
@@ -1110,7 +1110,8 @@ static int __devinit nvme_probe(struct pci_dev *pdev,
 	INIT_LIST_HEAD(&dev->namespaces);
 	dev->pci_dev = pdev;
 	pci_set_drvdata(pdev, dev);
-	dma_set_mask(&dev->pci_dev->dev, DMA_BIT_MASK(64));
+	dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
+	dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
 	nvme_set_instance(dev);
 	dev->entry[0].vector = pdev->irq;