Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / usb / gadget / at91_udc.c

diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 4063209fe8da2db96ef51d01e5082dd2d9ac4a53..36fd2b4b49a2cc23e8f9d1e76fee72cc7e8c693c 100644 (file)
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -29,7 +29,6 @@
 #include <linux/clk.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
-#include <linux/prefetch.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
 
@@ -561,6 +560,7 @@ static int at91_ep_disable (struct usb_ep * _ep)
 
        /* restore the endpoint's pristine config */
        ep->desc = NULL;
+       ep->ep.desc = NULL;
        ep->ep.maxpacket = ep->maxpacket;
 
        /* reset fifos and endpoint */