Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 4063209fe8da2db96ef51d01e5082dd2d9ac4a53..0c935d7c65bdf7379f466e5c3f1522fb88a7e266 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>
 
@@ -37,7 +36,6 @@
 #include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/system.h>
 #include <asm/gpio.h>
 
 #include <mach/board.h>
@@ -561,6 +559,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 */