Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

[~andy/linux] / drivers / usb / gadget / m66592-udc.c

diff --git a/drivers/usb/gadget/m66592-udc.c b/drivers/usb/gadget/m66592-udc.c
index 9aa1cbbee45b64597ef9bcc44d5ba5ed219b2d6a..3608b3bd57328fca524e6431229d166451992cf4 100644 (file)
--- a/drivers/usb/gadget/m66592-udc.c
+++ b/drivers/usb/gadget/m66592-udc.c
@@ -1472,7 +1472,7 @@ static int m66592_start(struct usb_gadget_driver *driver,
        int retval;
 
        if (!driver
-                       || driver->speed < USB_SPEED_HIGH
+                       || driver->max_speed < USB_SPEED_HIGH
                        || !bind
                        || !driver->setup)
                return -EINVAL;
@@ -1653,7 +1653,7 @@ static int __init m66592_probe(struct platform_device *pdev)
        m66592->gadget.ops = &m66592_gadget_ops;
        device_initialize(&m66592->gadget.dev);
        dev_set_name(&m66592->gadget.dev, "gadget");
-       m66592->gadget.is_dualspeed = 1;
+       m66592->gadget.max_speed = USB_SPEED_HIGH;
        m66592->gadget.dev.parent = &pdev->dev;
        m66592->gadget.dev.dma_mask = pdev->dev.dma_mask;
        m66592->gadget.dev.release = pdev->dev.release;