---

yaml --- r: 286238 b: refs/heads/master c: 2930353 h: refs/heads/master v: v3
git-mirror · Nov 4, 2011 · 1866deb · 1866deb
1 parent 6bbbc35
commit 1866deb
Show file tree

Hide file tree

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