forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PCI: Ensure we re-enable devices on resume

Browse source 
If the firmware puts a device back into D0 state at resume time, we'll
update its state in resume_noirq and thus skip the platform resume code.
Calling that code twice should be safe and we ought to avoid getting to
that point anyway, so remove the check and also allow the platform pci
code to be called for D0.

Fixes USB not being powered after resume on recent Lenovo machines.

Acked-by: Alex Chiang <achiang@canonical.com>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Matthew Garrett 2010-04-22 09:30:51 -04:00 • committed by Jesse Barnes
commit cc2893b6af
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/pci/pci.c
View file

@ -679,7 +679,7 @@ static void __pci_start_power_transition(struct pci_dev *dev, pci_power_t state)
*/ */
int __pci_complete_power_transition(struct pci_dev *dev, pci_power_t state) int __pci_complete_power_transition(struct pci_dev *dev, pci_power_t state)
{ {
return state > PCI_D0 ? return state >= PCI_D0 ?
pci_platform_power_transition(dev, state) : -EINVAL; pci_platform_power_transition(dev, state) : -EINVAL;
} }
EXPORT_SYMBOL_GPL(__pci_complete_power_transition); EXPORT_SYMBOL_GPL(__pci_complete_power_transition);
@ -716,10 +716,6 @@ int pci_set_power_state(struct pci_dev *dev, pci_power_t state)
*/ */
return 0; return 0;
/* Check if we're already there */
if (dev->current_state == state)
return 0;
__pci_start_power_transition(dev, state); __pci_start_power_transition(dev, state);
/* This device is quirked not to be put into D3, so /* This device is quirked not to be put into D3, so