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

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

diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index ce9dffb0515da0e571ddb4371c4ad226e7108354..9f98508966d10dd70202c7d7769451fef3e4d90d 100644 (file)
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -659,6 +659,7 @@ static int usba_ep_disable(struct usb_ep *_ep)
                return -EINVAL;
        }
        ep->desc = NULL;
+       ep->ep.desc = NULL;
 
        list_splice_init(&ep->queue, &req_list);
        if (ep->can_dma) {