summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2015-01-25 19:53:09 +0000
committerjhb <jhb@FreeBSD.org>2015-01-25 19:53:09 +0000
commita19f39141436a7d08e52c63534b5ee2b2740546e (patch)
tree47ccaec25d807e4ef8cb4493a5ac5c3292474548
parent35e00e3ca8ddb6e9696568f1ffa473f6817f650c (diff)
downloadFreeBSD-src-a19f39141436a7d08e52c63534b5ee2b2740546e.zip
FreeBSD-src-a19f39141436a7d08e52c63534b5ee2b2740546e.tar.gz
Pass a valid Dx state variable to PCIB_POWER_FOR_SLEEP() in pcib_resume()
instead of NULL. Submitted by: dchagin MFC after: 2 weeks
-rw-r--r--sys/dev/pci/pci_pci.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c
index f35b481..c7029f2 100644
--- a/sys/dev/pci/pci_pci.c
+++ b/sys/dev/pci/pci_pci.c
@@ -1114,11 +1114,13 @@ int
pcib_resume(device_t dev)
{
device_t pcib;
+ int dstate;
if (pci_do_power_resume) {
pcib = device_get_parent(device_get_parent(dev));
- if (PCIB_POWER_FOR_SLEEP(pcib, dev, NULL) == 0)
- pci_set_powerstate(dev, PCI_POWERSTATE_D0);
+ dstate = PCI_POWERSTATE_D0;
+ if (PCIB_POWER_FOR_SLEEP(pcib, dev, &dstate) == 0)
+ pci_set_powerstate(dev, dstate);
}
pcib_cfg_restore(device_get_softc(dev));
return (bus_generic_resume(dev));
OpenPOWER on IntegriCloud