Merge branch 'master' of git://git.denx.de/u-boot-usb

[u-boot] / drivers / usb / gadget / composite.c

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index f30778a163b2950b2681a5ea9b610a7d74d10fb3..f8677931b46cbbda93ff47c516ebae8acbf508cc 100644 (file)
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -997,7 +997,8 @@ static int composite_bind(struct usb_gadget *gadget)
        if (status < 0)
                goto fail;
 
-       cdev->desc = *composite->dev;
+       memcpy(&cdev->desc, composite->dev,
+              sizeof(struct usb_device_descriptor));
        cdev->desc.bMaxPacketSize0 = gadget->ep0->maxpacket;
 
        debug("%s: ready\n", composite->name);