diff options
| author |   Alan Stern <stern@rowland.harvard.edu> | 2012-04-03 15:24:43 -0400 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-09 15:43:21 -0700 |
| commit | b446b96fd11b69b7c4ecd47d869cff9094fd8802 (patch) | |
| tree | 9d8720826697457add5c6674428f64c0f21a1cc1 /drivers/usb/host/uhci-hub.c | |
| parent | EHCI: keep track of ports being resumed and indicate in hub_status_data (diff) | |
| download | linux-dev-b446b96fd11b69b7c4ecd47d869cff9094fd8802.tar.xz linux-dev-b446b96fd11b69b7c4ecd47d869cff9094fd8802.zip | |
UHCI: hub_status_data should indicate if ports are resuming
This patch (as1538) causes uhci_hub_status_data() to return a nonzero
value when any port is undergoing a resume transition while the root
hub is suspended. This will allow usbcore to handle races between
root-hub suspend and port wakeup.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/uhci-hub.c')
| -rw-r--r-- | drivers/usb/host/uhci-hub.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/host/uhci-hub.c b/drivers/usb/host/uhci-hub.c index 045cde4cbc3d..768d54295a20 100644 --- a/drivers/usb/host/uhci-hub.c +++ b/drivers/usb/host/uhci-hub.c @@ -196,11 +196,12 @@ static int uhci_hub_status_data(struct usb_hcd *hcd, char *buf) status = get_hub_status_data(uhci, buf); switch (uhci->rh_state) { - case UHCI_RH_SUSPENDING: case UHCI_RH_SUSPENDED: /* if port change, ask to be resumed */ - if (status || uhci->resuming_ports) + if (status || uhci->resuming_ports) { + status = 1; usb_hcd_resume_root_hub(hcd); + } break; case UHCI_RH_AUTO_STOPPED: |