aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2009-03-30 21:46:27 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2009-03-30 21:46:56 +0200
commit8efb8c76fcdccf5050c0ea059dac392789baaff2 (patch)
treee1633be5df4fa15755bfcfaf5007d8b972bcdff7 /drivers
parentb8e676d2432b8ce96967a3fe6601a0a28e64fa10 (diff)
PCI PM: Make pci_prepare_to_sleep() disable wake-up if needed
If the device is not supposed to wake up the system, ie. when device_may_wakeup(&dev->dev) returns 'false', pci_prepare_to_sleep() should pass 'false' to pci_enable_wake() so that it calls the platform to disable the wake-up capability of the device. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index de54fd643ba..0195066251e 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1263,7 +1263,7 @@ int pci_prepare_to_sleep(struct pci_dev *dev)
if (target_state == PCI_POWER_ERROR)
return -EIO;
- pci_enable_wake(dev, target_state, true);
+ pci_enable_wake(dev, target_state, device_may_wakeup(&dev->dev));
error = pci_set_power_state(dev, target_state);