IB/srp: Fix possible send queue overflow

[firefly-linux-kernel-4.4.55.git] / drivers / usb / isp1760 / isp1760-hcd.c

diff --git a/drivers/usb/isp1760/isp1760-hcd.c b/drivers/usb/isp1760/isp1760-hcd.c
index 3cb98b1d5d2960171bea26d4fff70e2217d9e7f0..ac31d19cc54bcee01cbde7e850d5744e53542777 100644 (file)
--- a/drivers/usb/isp1760/isp1760-hcd.c
+++ b/drivers/usb/isp1760/isp1760-hcd.c
@@ -1758,7 +1758,7 @@ static void isp1760_hub_descriptor(struct isp1760_hcd *priv,
        int ports = HCS_N_PORTS(priv->hcs_params);
        u16 temp;
 
-       desc->bDescriptorType = 0x29;
+       desc->bDescriptorType = USB_DT_HUB;
        /* priv 1.0, 2.3.9 says 20ms max */
        desc->bPwrOn2PwrGood = 10;
        desc->bHubContrCurrent = 0;
@@ -1869,7 +1869,7 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
                                reg_write32(hcd->regs, HC_PORTSC1,
                                                        temp | PORT_RESUME);
                                priv->reset_done = jiffies +
-                                       msecs_to_jiffies(20);
+                                       msecs_to_jiffies(USB_RESUME_TIMEOUT);
                        }
                        break;
                case USB_PORT_FEAT_C_SUSPEND: