Commit 49c96811 authored Feb 04, 2009 by Rafael J. Wysocki Committed by Jesse Barnes Feb 04, 2009

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>

parent cbbc2f6b

drivers/pci/pci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message