Merge tag 'for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux...

[deliverable/linux.git] / drivers / usb / musb / musb_virthub.c

diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c
index 294e159f4afe82a9f96a3d449976b7a2f48d6a13..86c4b533e90b3f9d33c4ff06c8e58d59928754f3 100644 (file)
--- a/drivers/usb/musb/musb_virthub.c
+++ b/drivers/usb/musb/musb_virthub.c
@@ -136,7 +136,7 @@ void musb_port_suspend(struct musb *musb, bool do_suspend)
                /* later, GetPortStatus will stop RESUME signaling */
                musb->port1_status |= MUSB_PORT_STAT_RESUME;
                schedule_delayed_work(&musb->finish_resume_work,
-                                     msecs_to_jiffies(20));
+                                     msecs_to_jiffies(USB_RESUME_TIMEOUT));
        }
 }
 
@@ -345,7 +345,7 @@ int musb_hub_control(
                struct usb_hub_descriptor *desc = (void *)buf;
 
                desc->bDescLength = 9;
-               desc->bDescriptorType = 0x29;
+               desc->bDescriptorType = USB_DT_HUB;
                desc->bNbrPorts = 1;
                desc->wHubCharacteristics = cpu_to_le16(
                        HUB_CHAR_INDV_PORT_LPSM /* per-port power switching */