Commit 49fe0353 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-pm' and 'pm-genirq' 

* acpi-pm:
  ACPI: invoke acpi_device_wakeup() with correct parameters

* pm-genirq:
  PCI / PM: handle failure to enable wakeup on PCIe PME
parents 96ed7532 67598a1d 5dfd7f9f

drivers/acpi/device_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ int acpi_pm_device_run_wake(struct device *phys_dev, bool enable) 
		return -ENODEV;

	}



	return acpi_device_wakeup(adev, enable, ACPI_STATE_S0);

	return acpi_device_wakeup(adev, ACPI_STATE_S0, enable);

}

EXPORT_SYMBOL(acpi_pm_device_run_wake);

#endif /* CONFIG_PM_RUNTIME */

drivers/pci/pcie/pme.c

+4 −2
Original line number Diff line number Diff line
@@ -397,6 +397,7 @@ static int pcie_pme_suspend(struct pcie_device *srv) 
	struct pcie_pme_service_data *data = get_service_data(srv);

	struct pci_dev *port = srv->port;

	bool wakeup;

	int ret;



	if (device_may_wakeup(&port->dev)) {

		wakeup = true;
@@ -407,9 +408,10 @@ static int pcie_pme_suspend(struct pcie_device *srv) 
	}

	spin_lock_irq(&data->lock);

	if (wakeup) {

		enable_irq_wake(srv->irq);

		ret = enable_irq_wake(srv->irq);

		data->suspend_level = PME_SUSPEND_WAKEUP;

	} else {

	}

	if (!wakeup || ret) {

		struct pci_dev *port = srv->port;



		pcie_pme_interrupt_enable(port, false);