aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2008-04-18 11:11:26 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-04-24 21:16:54 -0700
commitaff6d18f95bb81b2d07994372c8edcc2c2b41180 (patch)
treedcb93a3eb64c5c9a7bbe46c8fd6d09851d7b2007 /drivers/usb
parent4f6676274fb6303a8e8100d086ea8c2c00c0d8e3 (diff)
USB: fix compile problems in ehci-hcd
This patch (as1072) fixes some recently-introduced compile problems that show up in ehci-hcd when CONFIG_PM is turned off. PORT_WAKE_BITS needs to be defined always. ehci_port_power() is called during initialization by all the EHCI variants other than the PCI version, in which it is "defined but not used". So add a call to it. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/ehci-hub.c4
-rw-r--r--drivers/usb/host/ehci-pci.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 536b433d24f..efffef64f59 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/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/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 88dad4b5313..5bb7f6bb13f 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/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;