Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49c96811 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Jesse Barnes
Browse files

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: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarJesse 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;