UHCI: hub_status_data should indicate if ports are resuming
Alan Stern [Tue, 3 Apr 2012 19:24:43 +0000 (15:24 -0400)]
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>

drivers/usb/host/uhci-hub.c

index 045cde4..768d542 100644 (file)
@@ -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: