From 6bbbc35006387e3c16f8d162e92b08744589eb76 Mon Sep 17 00:00:00 2001
From: Matthew Wilcox <matthew.r.wilcox@intel.com>
Date: Tue, 1 Feb 2011 09:01:59 -0500
Subject: [PATCH] --- yaml --- r: 286237 b: refs/heads/master c:
 f64d3365a3e5cb46e69db7e2c82a7cb9a5bed1b8 h: refs/heads/master i:   286235:
 8449a198ce54e1ff40e916da6ac990cd13092614 v: v3

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

diff --git a/[refs] b/[refs]
index 6b986a9cea30..b19349136b78 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ee5a7d7cb9309bd393a25c395f19fb12a842602
+refs/heads/master: f64d3365a3e5cb46e69db7e2c82a7cb9a5bed1b8
diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c
index 1dda4b5c2302..128fd70031a9 100644
--- a/trunk/drivers/block/nvme.c
+++ b/trunk/drivers/block/nvme.c
@@ -1105,6 +1105,7 @@ static int __devinit nvme_probe(struct pci_dev *pdev,
 
 	if (pci_enable_device_mem(pdev))
 		goto free;
+	pci_set_master(pdev);
 
 	INIT_LIST_HEAD(&dev->namespaces);
 	dev->pci_dev = pdev;