From a55fcc3d7e76e0fd940fc6bbeff081c47a270f3c Mon Sep 17 00:00:00 2001
From: Kristen Accardi <kristen.c.accardi@intel.com>
Date: Fri, 28 Apr 2006 11:37:38 -0700
Subject: [PATCH] --- yaml --- r: 28582 b: refs/heads/master c:
 a1e022b3aeacf633a6c8e8f0eb04d9c9e44b4fcd h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/pci/pci.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 819388d03f0f..172a1fbe4e25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f125d30487cea72542a84b4835c037163c7f3d5
+refs/heads/master: a1e022b3aeacf633a6c8e8f0eb04d9c9e44b4fcd
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index fde41cc14734..aa480370ef10 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/drivers/pci/pci.c
@@ -517,7 +517,12 @@ pci_enable_device_bars(struct pci_dev *dev, int bars)
 int
 pci_enable_device(struct pci_dev *dev)
 {
-	int err = pci_enable_device_bars(dev, (1 << PCI_NUM_RESOURCES) - 1);
+	int err;
+
+	if (dev->is_enabled)
+		return 0;
+
+	err = pci_enable_device_bars(dev, (1 << PCI_NUM_RESOURCES) - 1);
 	if (err)
 		return err;
 	pci_fixup_device(pci_fixup_enable, dev);