diff options
Diffstat (limited to 'drivers/usb')
-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 536b433d24f7..efffef64f59d 100644 --- a/drivers/usb/host/ehci-hub.c +++ b/drivers/usb/host/ehci-hub.c | |||
@@ -28,10 +28,10 @@ | |||
28 | 28 | ||
29 | /*-------------------------------------------------------------------------*/ | 29 | /*-------------------------------------------------------------------------*/ |
30 | 30 | ||
31 | #ifdef CONFIG_PM | ||
32 | |||
33 | #define PORT_WAKE_BITS (PORT_WKOC_E|PORT_WKDISC_E|PORT_WKCONN_E) | 31 | #define PORT_WAKE_BITS (PORT_WKOC_E|PORT_WKDISC_E|PORT_WKCONN_E) |
34 | 32 | ||
33 | #ifdef CONFIG_PM | ||
34 | |||
35 | static int ehci_hub_control( | 35 | static int ehci_hub_control( |
36 | struct usb_hcd *hcd, | 36 | struct usb_hcd *hcd, |
37 | u16 typeReq, | 37 | u16 typeReq, |
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index 88dad4b53131..5bb7f6bb13f3 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) | |||
222 | ehci_warn(ehci, "selective suspend/wakeup unavailable\n"); | 222 | ehci_warn(ehci, "selective suspend/wakeup unavailable\n"); |
223 | #endif | 223 | #endif |
224 | 224 | ||
225 | ehci_port_power(ehci, 1); | ||
225 | retval = ehci_pci_reinit(ehci, pdev); | 226 | retval = ehci_pci_reinit(ehci, pdev); |
226 | done: | 227 | done: |
227 | return retval; | 228 | return retval; |