mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
Merge branch 'merge' into next
This commit is contained in:
commit
435462c6e6
269 changed files with 11363 additions and 1205 deletions
|
|
@ -557,7 +557,8 @@ static int pci_platform_power_transition(struct pci_dev *dev, pci_power_t state)
|
|||
} else {
|
||||
error = -ENODEV;
|
||||
/* Fall back to PCI_D0 if native PM is not supported */
|
||||
pci_update_current_state(dev, PCI_D0);
|
||||
if (!dev->pm_cap)
|
||||
dev->current_state = PCI_D0;
|
||||
}
|
||||
|
||||
return error;
|
||||
|
|
|
|||
Loading…
Reference in a new issue