1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
index c78c8740db1d..fbbbac2150a5 100644
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@ -257,6 +257,14 @@ static void dwc2_hcd_cleanup_channels(struct dwc2_hsotg *hsotg)
                  */
                 channel->qh = NULL;
         }
+        /* All channels have been freed, mark them available */
+        if (hsotg->core_params->uframe_sched > 0) {
+                hsotg->available_host_channels =
+                        hsotg->core_params->host_channels;
+        } else {
+                hsotg->non_periodic_channels = 0;
+                hsotg->periodic_channels = 0;
+        }
 }
 
 /**
@@ -1527,7 +1535,7 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
                         hprt0 |= HPRT0_RES;
                         writel(hprt0, hsotg->regs + HPRT0);
                         hprt0 &= ~HPRT0_SUSP;
-                        usleep_range(100000, 150000);
+                        msleep(USB_RESUME_TIMEOUT);
 
                         hprt0 &= ~HPRT0_RES;
                         writel(hprt0, hsotg->regs + HPRT0);
@@ -1608,7 +1616,7 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
                 dev_dbg(hsotg->dev, "GetHubDescriptor\n");
                 hub_desc = (struct usb_hub_descriptor *)buf;
                 hub_desc->bDescLength = 9;
-                hub_desc->bDescriptorType = 0x29;
+                hub_desc->bDescriptorType = USB_DT_HUB;
                 hub_desc->bNbrPorts = 1;
                 hub_desc->wHubCharacteristics =
                         cpu_to_le16(HUB_CHAR_COMMON_LPSM |