]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
ACPI/PCI: PM: Add missing wakeup.flags.valid checks
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 16 May 2019 10:42:20 +0000 (12:42 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 22 Jun 2019 06:15:17 +0000 (08:15 +0200)
commitee61fb4de955dc798513abe988e3c8cb8cf4479a
tree3a47bca436bb0254b437780aa1429ef49b4be28a
parentbc19b50b80ca166b2b62273e8f321fb339e015df
ACPI/PCI: PM: Add missing wakeup.flags.valid checks

[ Upstream commit 9a51c6b1f9e0239a9435db036b212498a2a3b75c ]

Both acpi_pci_need_resume() and acpi_dev_needs_resume() check if the
current ACPI wakeup configuration of the device matches what is
expected as far as system wakeup from sleep states is concerned, as
reflected by the device_may_wakeup() return value for the device.

However, they only should do that if wakeup.flags.valid is set for
the device's ACPI companion, because otherwise the wakeup.prepare_count
value for it is meaningless.

Add the missing wakeup.flags.valid checks to these functions.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/acpi/device_pm.c
drivers/pci/pci-acpi.c