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

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

diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c
index 3f87cb9344bbee4486e49324b548d5977aa5f52c..195524cde6c3d93069286c96ad7f80912ee53611 100644 (file)
--- a/drivers/usb/gadget/s3c2410_udc.c
+++ b/drivers/usb/gadget/s3c2410_udc.c
@@ -37,7 +37,6 @@
 #include <asm/byteorder.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/system.h>
 #include <asm/unaligned.h>
 #include <mach/irqs.h>
 
@@ -1148,6 +1147,7 @@ static int s3c2410_udc_ep_disable(struct usb_ep *_ep)
        dprintk(DEBUG_NORMAL, "ep_disable: %s\n", _ep->name);
 
        ep->desc = NULL;
+       ep->ep.desc = NULL;
        ep->halted = 1;
 
        s3c2410_udc_nuke (ep->dev, ep, -ESHUTDOWN);
@@ -1630,6 +1630,7 @@ static void s3c2410_udc_reinit(struct s3c2410_udc *dev)
 
                ep->dev = dev;
                ep->desc = NULL;
+               ep->ep.desc = NULL;
                ep->halted = 0;
                INIT_LIST_HEAD (&ep->queue);
        }