Merge branch 'u-boot/master' into 'u-boot-arm/master'

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

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 729a0fa94448d7ab7ae16b0b32b9d0f044f08694..d96296cd73b1f57815413afcc46e33f0e38390a0 100644 (file)
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1052,6 +1052,7 @@ static struct usb_gadget_driver composite_driver = {
        .unbind         = composite_unbind,
 
        .setup          = composite_setup,
+       .reset          = composite_disconnect,
        .disconnect     = composite_disconnect,
 
        .suspend        = composite_suspend,