4.13-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Roger Quadros <[email protected]>

commit 97e133d54c1ca8948b191e5721a145a76c4db33d upstream.

Consider the following case: udc controller supports SuperSpeed.  If we
first load a HighSpeed gadget followed by a SuperSpeed gadget, the
SuperSpeed gadget will be limited to HighSpeed as UDC core driver
doesn't call ->udc_set_speed() in the second case.

Call ->udc_set_speed() unconditionally to fix this issue.

This will also fix the case for dwc3 controller driver when SuperSpeed
gadget is loaded first and works in HighSpeed only as udc_set_speed()
was never being called.

Fixes: 6099eca796ae ("usb: gadget: core: introduce ->udc_set_speed() method")
Signed-off-by: Roger Quadros <[email protected]>
Signed-off-by: Felipe Balbi <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 drivers/usb/gadget/udc/core.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- a/drivers/usb/gadget/udc/core.c
+++ b/drivers/usb/gadget/udc/core.c
@@ -1314,8 +1314,7 @@ static int udc_bind_to_driver(struct usb
        udc->dev.driver = &driver->driver;
        udc->gadget->dev.driver = &driver->driver;
 
-       if (driver->max_speed < udc->gadget->max_speed)
-               usb_gadget_udc_set_speed(udc, driver->max_speed);
+       usb_gadget_udc_set_speed(udc, driver->max_speed);
 
        ret = driver->bind(udc->gadget, driver);
        if (ret)


Reply via email to