From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Mon, 30 Mar 2009 19:46:27 +0000 (+0200)
Subject: PCI PM: Make pci_prepare_to_sleep() disable wake-up if needed
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8efb8c76fcdccf5050c0ea059dac392789baaff2;p=linux-2.6-omap-h63xx.git

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>
---

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);