Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 13:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

PCI PM: Fix pci_prepare_to_sleep

Browse Source 
The recently introduced pci_prepare_to_sleep() needs the following fix,
because there are systems which are not power manageable by ACPI (ie.
ACPI doesn't provide methods to put the device into low power states and
back), but require ACPI hooks to be executed for wake-up to work.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Rafael J. Wysocki 2008-07-13 22:45:06 +02:00 committed by Jesse Barnes
parent beef3129b3
commit c157dfa3e4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pci/pci.c
View File

@ -1152,7 +1152,6 @@ int pci_prepare_to_sleep(struct pci_dev *dev)
break;
default:
target_state = state;
pci_enable_wake(dev, target_state, true);
}
} else if (device_may_wakeup(&dev->dev)) {
/*
@ -1167,10 +1166,11 @@ int pci_prepare_to_sleep(struct pci_dev *dev)
while (target_state
&& !(dev->pme_support & (1 << target_state)))
target_state--;
pci_pme_active(dev, true);
}
}
pci_enable_wake(dev, target_state, true);
error = pci_set_power_state(dev, target_state);
if (error)