lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 into linux-next

Browse Source
This commit is contained in:
Jesse Barnes
2008-06-12 12:06:58 -07:00
committed by Jesse Barnes
parent 8344b568f5 0e6859d49f
commit 53eb2fbeb9
34 changed files with 80 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pci/pci.c
View File

@ -506,7 +506,7 @@ pci_set_power_state(struct pci_dev *dev, pci_power_t state)
return 0;
}
pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev, pm_message_t state);
pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev);
/**
* pci_choose_state - Choose the power state of a PCI device
@ -526,7 +526,7 @@ pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state)
return PCI_D0;
if (platform_pci_choose_state) {
ret = platform_pci_choose_state(dev, state);
ret = platform_pci_choose_state(dev);
if (ret != PCI_POWER_ERROR)
return ret;
}