From d1b159f7a4cb941146bddfc8bce73b28b8394b69 Mon Sep 17 00:00:00 2001 From: Matthew Wilcox Date: Mon, 19 Sep 2011 17:14:53 -0400 Subject: [PATCH] --- yaml --- r: 286306 b: refs/heads/master c: 684f5c2025b067a23722e620d0b3b858d8dc5d01 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/nvme.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cafb4f62d87b..db6e8290d991 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1a490e026efb22851ed60588b5fad1281d80ec3 +refs/heads/master: 684f5c2025b067a23722e620d0b3b858d8dc5d01 diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c index a7f82fbdaf87..705f66ebd15f 100644 --- a/trunk/drivers/block/nvme.c +++ b/trunk/drivers/block/nvme.c @@ -1457,7 +1457,7 @@ static int __devinit nvme_dev_add(struct nvme_dev *dev) list_for_each_entry(ns, &dev->namespaces, list) add_disk(ns->disk); - dma_free_coherent(&dev->pci_dev->dev, 4096, id, dma_addr); + dma_free_coherent(&dev->pci_dev->dev, 8192, id, dma_addr); return 0; out_free: @@ -1466,7 +1466,7 @@ static int __devinit nvme_dev_add(struct nvme_dev *dev) nvme_ns_free(ns); } - dma_free_coherent(&dev->pci_dev->dev, 4096, id, dma_addr); + dma_free_coherent(&dev->pci_dev->dev, 8192, mem, dma_addr); return res; }