diff --git a/[refs] b/[refs] index c5b82f5c4af3..4f186c70d42d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0e88af855cbc5012f2e796f42686969b82d79d4 +refs/heads/master: bebd590ca27e80ffe3129ab4f0a3124f0a340f43 diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c index d4d71fae6233..1fb7cff4cdae 100644 --- a/trunk/drivers/pci/pci.c +++ b/trunk/drivers/pci/pci.c @@ -1091,7 +1091,7 @@ int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable) int error = 0; bool pme_done = false; - if (!device_may_wakeup(&dev->dev)) + if (enable && !device_may_wakeup(&dev->dev)) return -EINVAL; /*