From 13aecfa52f1e267e18b27c9f7cc14d20e29705e1 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Wed, 7 Jan 2009 13:10:35 +0100
Subject: [PATCH] --- yaml --- r: 127424 b: refs/heads/master c:
 98e6e286d7b01deb7453b717aa38ebb69d6cefc0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f471cc41751f..df6ebbe9ef75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad8cfa1defee14a5181d9b63e666318c51cfaeed
+refs/heads/master: 98e6e286d7b01deb7453b717aa38ebb69d6cefc0
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index e491fdedf705..c12f6c790698 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/drivers/pci/pci.c
@@ -1260,14 +1260,15 @@ void pci_pm_init(struct pci_dev *dev)
 	/* find PCI PM capability in list */
 	pm = pci_find_capability(dev, PCI_CAP_ID_PM);
 	if (!pm)
-		return;
+		goto Exit;
+
 	/* Check device's ability to generate PME# */
 	pci_read_config_word(dev, pm + PCI_PM_PMC, &pmc);
 
 	if ((pmc & PCI_PM_CAP_VER_MASK) > 3) {
 		dev_err(&dev->dev, "unsupported PM cap regs version (%u)\n",
 			pmc & PCI_PM_CAP_VER_MASK);
-		return;
+		goto Exit;
 	}
 
 	dev->pm_cap = pm;
@@ -1306,6 +1307,9 @@ void pci_pm_init(struct pci_dev *dev)
 	} else {
 		dev->pme_support = 0;
 	}
+
+ Exit:
+	pci_update_current_state(dev, PCI_D0);
 }
 
 /**