From 2957a89d49d8e7034c154c643fe71dc4b6421ad1 Mon Sep 17 00:00:00 2001
From: Shane Michael Matthews <shane.matthews@intel.com>
Date: Tue, 1 Feb 2011 08:49:30 -0500
Subject: [PATCH] --- yaml --- r: 286236 b: refs/heads/master c:
 0ee5a7d7cb9309bd393a25c395f19fb12a842602 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/block/nvme.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 074a3fdd8aeb..6b986a9cea30 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f85d50b609e8a5ef151656210203a6e94c19538
+refs/heads/master: 0ee5a7d7cb9309bd393a25c395f19fb12a842602
diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c
index dc821776be94..1dda4b5c2302 100644
--- a/trunk/drivers/block/nvme.c
+++ b/trunk/drivers/block/nvme.c
@@ -1103,6 +1103,9 @@ static int __devinit nvme_probe(struct pci_dev *pdev,
 	if (!dev->queues)
 		goto free;
 
+	if (pci_enable_device_mem(pdev))
+		goto free;
+
 	INIT_LIST_HEAD(&dev->namespaces);
 	dev->pci_dev = pdev;
 	pci_set_drvdata(pdev, dev);
@@ -1133,6 +1136,7 @@ static int __devinit nvme_probe(struct pci_dev *pdev,
  disable:
 	pci_disable_msix(pdev);
 	nvme_release_instance(dev);
+	pci_disable_device(pdev);
  free:
 	kfree(dev->queues);
 	kfree(dev->entry);
@@ -1147,6 +1151,7 @@ static void __devexit nvme_remove(struct pci_dev *pdev)
 	pci_disable_msix(pdev);
 	iounmap(dev->bar);
 	nvme_release_instance(dev);
+	pci_disable_device(pdev);
 	kfree(dev->queues);
 	kfree(dev->entry);
 	kfree(dev);