From 65d478c0e1b120e02723c74dc06115654beea6ec Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg@redhat.com>
Date: Thu, 22 Apr 2010 09:30:51 -0400
Subject: [PATCH] --- yaml --- r: 190218 b: refs/heads/master c:
 cc2893b6af5265baa1d68b17b136cffca9e40cfa h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6de2316a698e..7bc3544abdd5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66528fdd45b082bf7c74687d72ae08afa4a446f8
+refs/heads/master: cc2893b6af5265baa1d68b17b136cffca9e40cfa
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index 5ea587e59e48..37499127c801 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/drivers/pci/pci.c
@@ -679,7 +679,7 @@ static void __pci_start_power_transition(struct pci_dev *dev, pci_power_t state)
  */
 int __pci_complete_power_transition(struct pci_dev *dev, pci_power_t state)
 {
-	return state > PCI_D0 ?
+	return state >= PCI_D0 ?
 			pci_platform_power_transition(dev, state) : -EINVAL;
 }
 EXPORT_SYMBOL_GPL(__pci_complete_power_transition);
@@ -716,10 +716,6 @@ int pci_set_power_state(struct pci_dev *dev, pci_power_t state)
 		 */
 		return 0;
 
-	/* Check if we're already there */
-	if (dev->current_state == state)
-		return 0;
-
 	__pci_start_power_transition(dev, state);
 
 	/* This device is quirked not to be put into D3, so