diff options
Diffstat (limited to 'drivers/usb/host/ehci-hub.c')
-rw-r--r-- | drivers/usb/host/ehci-hub.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c index d03e3cad5ca8..b2ee13c58517 100644 --- a/drivers/usb/host/ehci-hub.c +++ b/drivers/usb/host/ehci-hub.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2001-2004 by David Brownell | 2 | * Copyright (C) 2001-2004 by David Brownell |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms of the GNU General Public License as published by the | 5 | * under the terms of the GNU General Public License as published by the |
6 | * Free Software Foundation; either version 2 of the License, or (at your | 6 | * Free Software Foundation; either version 2 of the License, or (at your |
@@ -48,7 +48,7 @@ static int ehci_bus_suspend (struct usb_hcd *hcd) | |||
48 | } | 48 | } |
49 | ehci->command = readl (&ehci->regs->command); | 49 | ehci->command = readl (&ehci->regs->command); |
50 | if (ehci->reclaim) | 50 | if (ehci->reclaim) |
51 | ehci->reclaim_ready = 1; | 51 | end_unlink_async (ehci, NULL); |
52 | ehci_work(ehci, NULL); | 52 | ehci_work(ehci, NULL); |
53 | 53 | ||
54 | /* suspend any active/unsuspended ports, maybe allow wakeup */ | 54 | /* suspend any active/unsuspended ports, maybe allow wakeup */ |
@@ -103,10 +103,10 @@ static int ehci_bus_resume (struct usb_hcd *hcd) | |||
103 | 103 | ||
104 | /* re-init operational registers in case we lost power */ | 104 | /* re-init operational registers in case we lost power */ |
105 | if (readl (&ehci->regs->intr_enable) == 0) { | 105 | if (readl (&ehci->regs->intr_enable) == 0) { |
106 | /* at least some APM implementations will try to deliver | 106 | /* at least some APM implementations will try to deliver |
107 | * IRQs right away, so delay them until we're ready. | 107 | * IRQs right away, so delay them until we're ready. |
108 | */ | 108 | */ |
109 | intr_enable = 1; | 109 | intr_enable = 1; |
110 | writel (0, &ehci->regs->segment); | 110 | writel (0, &ehci->regs->segment); |
111 | writel (ehci->periodic_dma, &ehci->regs->frame_list); | 111 | writel (ehci->periodic_dma, &ehci->regs->frame_list); |
112 | writel ((u32)ehci->async->qh_dma, &ehci->regs->async_next); | 112 | writel ((u32)ehci->async->qh_dma, &ehci->regs->async_next); |
@@ -232,7 +232,7 @@ ehci_hub_status_data (struct usb_hcd *hcd, char *buf) | |||
232 | buf [1] = 0; | 232 | buf [1] = 0; |
233 | retval++; | 233 | retval++; |
234 | } | 234 | } |
235 | 235 | ||
236 | /* no hub change reports (bit 0) for now (power, ...) */ | 236 | /* no hub change reports (bit 0) for now (power, ...) */ |
237 | 237 | ||
238 | /* port N changes (bit N)? */ | 238 | /* port N changes (bit N)? */ |
@@ -304,7 +304,7 @@ ehci_hub_descriptor ( | |||
304 | 304 | ||
305 | /*-------------------------------------------------------------------------*/ | 305 | /*-------------------------------------------------------------------------*/ |
306 | 306 | ||
307 | #define PORT_WAKE_BITS (PORT_WKOC_E|PORT_WKDISC_E|PORT_WKCONN_E) | 307 | #define PORT_WAKE_BITS (PORT_WKOC_E|PORT_WKDISC_E|PORT_WKCONN_E) |
308 | 308 | ||
309 | static int ehci_hub_control ( | 309 | static int ehci_hub_control ( |
310 | struct usb_hcd *hcd, | 310 | struct usb_hcd *hcd, |