Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / usb / gadget / composite.c

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index f71b0787983f29469222e3e83631d17636c400ce..a95de6a4a13447d3217d7495bcd94079bca04903 100644 (file)
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1535,9 +1535,9 @@ composite_resume(struct usb_gadget *gadget)
 
 static struct usb_gadget_driver composite_driver = {
 #ifdef CONFIG_USB_GADGET_SUPERSPEED
-       .speed          = USB_SPEED_SUPER,
+       .max_speed      = USB_SPEED_SUPER,
 #else
-       .speed          = USB_SPEED_HIGH,
+       .max_speed      = USB_SPEED_HIGH,
 #endif
 
        .unbind         = composite_unbind,
@@ -1584,8 +1584,8 @@ int usb_composite_probe(struct usb_composite_driver *driver,
                driver->iProduct = driver->name;
        composite_driver.function =  (char *) driver->name;
        composite_driver.driver.name = driver->name;
-       composite_driver.speed = min((u8)composite_driver.speed,
-                                    (u8)driver->max_speed);
+       composite_driver.max_speed =
+               min_t(u8, composite_driver.max_speed, driver->max_speed);
        composite = driver;
        composite_gadget_bind = bind;