diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2008-12-16 20:06:58 +0100 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-01-07 20:12:56 +0100 |
| commit | bebd590ca27e80ffe3129ab4f0a3124f0a340f43 (patch) | |
| tree | 6b303ff88ede1dbd4e4ce0520e0fedd350127d7e /drivers/pci/pci.c | |
| parent | PCI: parisc: use generic pci_swizzle_interrupt_pin() (diff) | |
| download | linux-bebd590ca27e80ffe3129ab4f0a3124f0a340f43.tar.xz linux-bebd590ca27e80ffe3129ab4f0a3124f0a340f43.zip | |
PCI: fix incorrect error return in pci_enable_wake
This patch (as1186) fixes a minor mistake in pci_enable_wake(). When
the routine is asked to disable remote wakeup, it should not return an
error merely because the device is not allowed to do wakeups!
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index d4d71fae6233..1fb7cff4cdae 100644 --- a/drivers/pci/pci.c +++ b/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; /* |