Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

[~andy/linux] / drivers / usb / gadget / fusb300_udc.c

diff --git a/drivers/usb/gadget/fusb300_udc.c b/drivers/usb/gadget/fusb300_udc.c
index 74da206c84060c7226a717a5a4ec76309fddc8d5..5831cb4a0b35733dd6cf7202722eee1764c0aa82 100644 (file)
--- a/drivers/usb/gadget/fusb300_udc.c
+++ b/drivers/usb/gadget/fusb300_udc.c
@@ -1317,7 +1317,7 @@ static int fusb300_udc_start(struct usb_gadget_driver *driver,
        int retval;
 
        if (!driver
-                       || driver->speed < USB_SPEED_FULL
+                       || driver->max_speed < USB_SPEED_FULL
                        || !bind
                        || !driver->setup)
                return -EINVAL;
@@ -1463,7 +1463,7 @@ static int __init fusb300_probe(struct platform_device *pdev)
 
        dev_set_name(&fusb300->gadget.dev, "gadget");
 
-       fusb300->gadget.is_dualspeed = 1;
+       fusb300->gadget.max_speed = USB_SPEED_HIGH;
        fusb300->gadget.dev.parent = &pdev->dev;
        fusb300->gadget.dev.dma_mask = pdev->dev.dma_mask;
        fusb300->gadget.dev.release = pdev->dev.release;