From 67def95ae465e478055a3d073d5f003def4556a2 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Wed, 28 Sep 2005 17:50:51 -0400
Subject: [PATCH] --- yaml --- r: 10667 b: refs/heads/master c:
 d3535fbbce0eef8faa8de30d187fc83b11b858ef h: refs/heads/master i:   10665:
 859f8f684ca6803d74cd311960e8ba4fde1e7c2e   10663:
 a7a5a97e590fea475743bfc7f820002eeb49e950 v: v3

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

diff --git a/[refs] b/[refs]
index b2323ecb3bd1..44a90802b685 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b30197d2c07b396907b81673354a015a9d2b216c
+refs/heads/master: d3535fbbce0eef8faa8de30d187fc83b11b858ef
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index 259d247b7551..39bdb938521d 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/drivers/pci/pci.c
@@ -314,19 +314,19 @@ pci_set_power_state(struct pci_dev *dev, pci_power_t state)
 	 * sets PowerState to 0.
 	 */
 	switch (dev->current_state) {
+	case PCI_D0:
+	case PCI_D1:
+	case PCI_D2:
+		pmcsr &= ~PCI_PM_CTRL_STATE_MASK;
+		pmcsr |= state;
+		break;
 	case PCI_UNKNOWN: /* Boot-up */
 		if ((pmcsr & PCI_PM_CTRL_STATE_MASK) == PCI_D3hot
 		 && !(pmcsr & PCI_PM_CTRL_NO_SOFT_RESET))
 			need_restore = 1;
 		/* Fall-through: force to D0 */
-	case PCI_D3hot:
-	case PCI_D3cold:
-	case PCI_POWER_ERROR:
-		pmcsr = 0;
-		break;
 	default:
-		pmcsr &= ~PCI_PM_CTRL_STATE_MASK;
-		pmcsr |= state;
+		pmcsr = 0;
 		break;
 	}