PCI PM: Make pci_prepare_to_sleep() disable wake-up if needed
authorRafael J. Wysocki <rjw@sisk.pl>
Mon, 30 Mar 2009 19:46:27 +0000 (21:46 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Mon, 30 Mar 2009 19:46:56 +0000 (21:46 +0200)
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>
drivers/pci/pci.c

index de54fd643baf73009cd36f8bd766cfe67fff94ce..0195066251e52c152fa07ff9416e34e3c3c66314 100644 (file)
@@ -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);