---

yaml --- r: 93370 b: refs/heads/master c: aff6d18 h: refs/heads/master v: v3
git-mirror · Apr 25, 2008 · 03f2ff4 · 03f2ff4
1 parent c9210e9
commit 03f2ff4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f6676274fb6303a8e8100d086ea8c2c00c0d8e3
+refs/heads/master: aff6d18f95bb81b2d07994372c8edcc2c2b41180
diff --git a/trunk/drivers/usb/host/ehci-hub.c b/trunk/drivers/usb/host/ehci-hub.c
@@ -28,10 +28,10 @@
 
 /*-------------------------------------------------------------------------*/
 
-#ifdef	CONFIG_PM
-
 #define	PORT_WAKE_BITS	(PORT_WKOC_E|PORT_WKDISC_E|PORT_WKCONN_E)
 
+#ifdef	CONFIG_PM
+
 static int ehci_hub_control(
 	struct usb_hcd	*hcd,
 	u16		typeReq,

diff --git a/trunk/drivers/usb/host/ehci-pci.c b/trunk/drivers/usb/host/ehci-pci.c
@@ -222,6 +222,7 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
 		ehci_warn(ehci, "selective suspend/wakeup unavailable\n");
 #endif
 
+	ehci_port_power(ehci, 1);
 	retval = ehci_pci_reinit(ehci, pdev);
 done:
 	return retval;