Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / drivers / pci / pci-acpi.c

diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index c5e1a097d7e331c38e2aa83914349407e9812d05..1897847ceb0ca871b150867826603dcca95d9736 100644 (file)
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -733,7 +733,8 @@ static bool acpi_pci_need_resume(struct pci_dev *dev)
        if (!adev || !acpi_device_power_manageable(adev))
                return false;
 
-       if (device_may_wakeup(&dev->dev) != !!adev->wakeup.prepare_count)
+       if (adev->wakeup.flags.valid &&
+           device_may_wakeup(&dev->dev) != !!adev->wakeup.prepare_count)
                return true;
 
        if (acpi_target_system_state() == ACPI_STATE_S0)