aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/nvme.c
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew.r.wilcox@intel.com>2011-09-19 17:14:53 -0400
committerMatthew Wilcox <matthew.r.wilcox@intel.com>2011-11-04 15:53:04 -0400
commit684f5c2025b067a23722e620d0b3b858d8dc5d01 (patch)
tree3e1874b9a601d5dc9ff57a1ddf0221ca89904455 /drivers/block/nvme.c
parentd1a490e026efb22851ed60588b5fad1281d80ec3 (diff)
NVMe: Fix memory leak in nvme_dev_add()
The driver was allocating 8k of memory, then freeing 4k of it. Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Diffstat (limited to 'drivers/block/nvme.c')
-rw-r--r--drivers/block/nvme.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c
index a7f82fbdaf87..705f66ebd15f 100644
--- a/drivers/block/nvme.c
+++ b/drivers/block/nvme.c
@@ -1457,7 +1457,7 @@ static int __devinit nvme_dev_add(struct nvme_dev *dev)
1457 list_for_each_entry(ns, &dev->namespaces, list) 1457 list_for_each_entry(ns, &dev->namespaces, list)
1458 add_disk(ns->disk); 1458 add_disk(ns->disk);
1459 1459
1460 dma_free_coherent(&dev->pci_dev->dev, 4096, id, dma_addr); 1460 dma_free_coherent(&dev->pci_dev->dev, 8192, id, dma_addr);
1461 return 0; 1461 return 0;
1462 1462
1463 out_free: 1463 out_free:
@@ -1466,7 +1466,7 @@ static int __devinit nvme_dev_add(struct nvme_dev *dev)
1466 nvme_ns_free(ns); 1466 nvme_ns_free(ns);
1467 } 1467 }
1468 1468
1469 dma_free_coherent(&dev->pci_dev->dev, 4096, id, dma_addr); 1469 dma_free_coherent(&dev->pci_dev->dev, 8192, mem, dma_addr);
1470 return res; 1470 return res;
1471} 1471}
1472 1472