From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Wed, 4 Feb 2009 01:02:15 +0000 (+0100)
Subject: PCI PM: Read power state from device after trying to change it on resume
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=49c968111aee4a463d3247937b63efa63a65f378;p=linux-2.6-omap-h63xx.git

PCI PM: Read power state from device after trying to change it on resume

pci_restore_standard_config() unconditionally changes current_state
to PCI_D0 after attempting to change the device's power state, but
it should rather read the actual current power state from the
device.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 87c904233bf..e3efe6b19ee 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1418,7 +1418,7 @@ int pci_restore_standard_config(struct pci_dev *dev)
 		break;
 	}
 
-	dev->current_state = PCI_D0;
+	pci_update_current_state(dev, PCI_D0);
 
  Restore:
 	return dev->state_saved ? pci_restore_state(dev) : 0;