xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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

6
drivers/pci/pci-acpi.c
View File

@@ -239,13 +239,11 @@ EXPORT_SYMBOL(pci_osc_control_set);
* choose highest power _SxD or any lower power
*/
static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev,
pm_message_t state)
static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev)
{
int acpi_state;
acpi_state = acpi_pm_device_sleep_state(&pdev->dev,
device_may_wakeup(&pdev->dev), NULL);
acpi_state = acpi_pm_device_sleep_state(&pdev->dev, NULL);
if (acpi_state < 0)
return PCI_POWER_ERROR;