diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2008-04-18 11:11:26 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-24 21:16:54 -0700 |
| commit | aff6d18f95bb81b2d07994372c8edcc2c2b41180 (patch) | |
| tree | dcb93a3eb64c5c9a7bbe46c8fd6d09851d7b2007 /drivers/usb/host | |
| parent | 4f6676274fb6303a8e8100d086ea8c2c00c0d8e3 (diff) | |
| download | op-kernel-dev-aff6d18f95bb81b2d07994372c8edcc2c2b41180.zip op-kernel-dev-aff6d18f95bb81b2d07994372c8edcc2c2b41180.tar.gz | |
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/host')
| -rw-r--r-- | drivers/usb/host/ehci-hub.c | 4 | ||||
| -rw-r--r-- | drivers/usb/host/ehci-pci.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c index 536b433..efffef6 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 88dad4b..5bb7f6b 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; |
