From 28db0b7c931bfb0e5b07a4d16734310343b19ec0 Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Tue, 13 Jan 2009 11:35:54 -0500
Subject: [PATCH] --- yaml --- r: 130303 b: refs/heads/master c:
 bcca06efea883bdf3803a0bb0ffa60f26730387d h: refs/heads/master i:   130301:
 2323b6d26205ad21b4288bae48216849793986b5   130299:
 24942ab2b3f6286599fb0ba392d76663f35387d6   130295:
 40f34ee4940a549290071b4e69495f306066af81   130287:
 f36ff965552aa5f1982ae92800961d35449f5d4b   130271:
 4093be61ebe6a15f92279ffdf3811cc04a77d887   130239:
 a4471477e837b1b1c47a502bc7c7a036fb47b7c8   130175:
 84f8b348eabeba748a5051e789d95fc58e6eb0b4   130047:
 1c6e33aa348a09cce2b27e193bf121abfa4520af v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/usb/core/hcd-pci.c  | 1 -
 trunk/drivers/usb/host/ehci-pci.c | 2 +-
 trunk/drivers/usb/host/ohci-hcd.c | 8 +++-----
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 00096253ffe0..8afad944548b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b90de8aea36ae6fe8050a6e91b031369c4f251b2
+refs/heads/master: bcca06efea883bdf3803a0bb0ffa60f26730387d
diff --git a/trunk/drivers/usb/core/hcd-pci.c b/trunk/drivers/usb/core/hcd-pci.c
index 507741ed4482..99432785f438 100644
--- a/trunk/drivers/usb/core/hcd-pci.c
+++ b/trunk/drivers/usb/core/hcd-pci.c
@@ -128,7 +128,6 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
 	}
 
 	pci_set_master(dev);
-	device_set_wakeup_enable(&dev->dev, 1);
 
 	retval = usb_add_hcd(hcd, dev->irq, IRQF_DISABLED | IRQF_SHARED);
 	if (retval != 0)
diff --git a/trunk/drivers/usb/host/ehci-pci.c b/trunk/drivers/usb/host/ehci-pci.c
index bdc6e86e1f8b..9faa5c8fe025 100644
--- a/trunk/drivers/usb/host/ehci-pci.c
+++ b/trunk/drivers/usb/host/ehci-pci.c
@@ -230,7 +230,7 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
 		pci_read_config_word(pdev, 0x62, &port_wake);
 		if (port_wake & 0x0001) {
 			dev_warn(&pdev->dev, "Enabling legacy PCI PM\n");
-			device_init_wakeup(&pdev->dev, 1);
+			device_set_wakeup_capable(&pdev->dev, 1);
 		}
 	}
 
diff --git a/trunk/drivers/usb/host/ohci-hcd.c b/trunk/drivers/usb/host/ohci-hcd.c
index 65a9609f4ad6..5cf5f1eca4f4 100644
--- a/trunk/drivers/usb/host/ohci-hcd.c
+++ b/trunk/drivers/usb/host/ohci-hcd.c
@@ -593,12 +593,10 @@ static int ohci_run (struct ohci_hcd *ohci)
 	 * to be checked in case boot firmware (BIOS/SMM/...) has set up
 	 * wakeup in a way the bus isn't aware of (e.g., legacy PCI PM).
 	 * If the bus glue detected wakeup capability then it should
-	 * already be enabled.  Either way, if wakeup should be enabled
-	 * but isn't, we'll enable it now.
+	 * already be enabled; if so we'll just enable it again.
 	 */
-	if ((ohci->hc_control & OHCI_CTRL_RWC) != 0
-			&& !device_can_wakeup(hcd->self.controller))
-		device_init_wakeup(hcd->self.controller, 1);
+	if ((ohci->hc_control & OHCI_CTRL_RWC) != 0)
+		device_set_wakeup_capable(hcd->self.controller, 1);
 
 	switch (ohci->hc_control & OHCI_CTRL_HCFS) {
 	case OHCI_USB_OPER: