diff options
| author | Rafael J. Wysocki | 2009-02-04 02:02:15 +0100 |
|---|---|---|
| committer | Jesse Barnes | 2009-02-05 02:22:28 +0100 |
| commit | 49c968111aee4a463d3247937b63efa63a65f378 (patch) | |
| tree | 45102dd69858263623dae0db56f67a09a7b15c5c /drivers/pci/pci.c | |
| parent | PCI PM: Do not disable and enable bridges during suspend-resume (diff) | |
| download | kernel-qcow2-linux-49c968111aee4a463d3247937b63efa63a65f378.tar.gz kernel-qcow2-linux-49c968111aee4a463d3247937b63efa63a65f378.tar.xz kernel-qcow2-linux-49c968111aee4a463d3247937b63efa63a65f378.zip | |
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/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 87c904233bf5..e3efe6b19ee7 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; |