summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2009-02-04 02:02:15 +0100
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-02-04 17:22:28 -0800
commit49c968111aee4a463d3247937b63efa63a65f378 (patch)
tree45102dd69858263623dae0db56f67a09a7b15c5c /drivers/pci
parentcbbc2f6b0d438f80831c20124137ea92f0e5149b (diff)
downloadop-kernel-dev-49c968111aee4a463d3247937b63efa63a65f378.zip
op-kernel-dev-49c968111aee4a463d3247937b63efa63a65f378.tar.gz
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>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 87c9042..e3efe6b 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;
OpenPOWER on IntegriCloud