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

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

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 729a0fa94448d7ab7ae16b0b32b9d0f044f08694..a13b21d0a0f233833d616735460b51da288a83a8 100644 (file)
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -948,6 +948,7 @@ static void composite_unbind(struct usb_gadget *gadget)
                        debug("unbind config '%s'/%p\n", c->label, c);
                        c->unbind(c);
                }
+               free(c);
        }
        if (composite->unbind)
                composite->unbind(cdev);
@@ -1052,6 +1053,7 @@ static struct usb_gadget_driver composite_driver = {
        .unbind         = composite_unbind,
 
        .setup          = composite_setup,
+       .reset          = composite_disconnect,
        .disconnect     = composite_disconnect,
 
        .suspend        = composite_suspend,