15 files changed, 18 insertions, 0 deletions

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index a696bde5322..a1a04d00a9e 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -440,6 +440,7 @@ static int __dwc3_gadget_ep_disable(struct dwc3_ep *dep)
 
         dep->stream_capable = false;
         dep->desc = NULL;
+        dep->endpoint.desc = NULL;
         dep->comp_desc = NULL;
         dep->type = 0;
         dep->flags = 0;
diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c
index c16ff55a74e..18883bd0f16 100644
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/amd5536udc.c
@@ -445,6 +445,7 @@ static void ep_init(struct udc_regs __iomem *regs, struct udc_ep *ep)
 
         VDBG(ep->dev, "ep-%d reset\n", ep->num);
         ep->desc = NULL;
+        ep->ep.desc = NULL;
         ep->ep.ops = &udc_ep_ops;
         INIT_LIST_HEAD(&ep->queue);
 
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index d8dee225bf8..15a8cdb2ded 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -557,6 +557,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 */
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index e2fb6d583bd..5e10f651ad6 100644
--- 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) {
diff --git a/drivers/usb/gadget/ci13xxx_udc.c b/drivers/usb/gadget/ci13xxx_udc.c
index 27e31371842..9e892890e08 100644
--- a/drivers/usb/gadget/ci13xxx_udc.c
+++ b/drivers/usb/gadget/ci13xxx_udc.c
@@ -2181,6 +2181,7 @@ static int ep_disable(struct usb_ep *ep)
         } while (mEp->dir != direction);
 
         mEp->desc = NULL;
+        mEp->ep.desc = NULL;
 
         spin_unlock_irqrestore(mEp->lock, flags);
         return retval;
diff --git a/drivers/usb/gadget/fsl_qe_udc.c b/drivers/usb/gadget/fsl_qe_udc.c
index b95697c03d0..877a2c46672 100644
--- a/drivers/usb/gadget/fsl_qe_udc.c
+++ b/drivers/usb/gadget/fsl_qe_udc.c
@@ -1638,6 +1638,7 @@ static int qe_ep_disable(struct usb_ep *_ep)
         /* Nuke all pending requests (does flush) */
         nuke(ep, -ESHUTDOWN);
         ep->desc = NULL;
+        ep->ep.desc = NULL;
         ep->stopped = 1;
         ep->tx_req = NULL;
         qe_ep_reset(udc, ep->epnum);
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c
index d7ea6c076ce..b5435735042 100644
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/fsl_udc_core.c
@@ -659,6 +659,7 @@ static int fsl_ep_disable(struct usb_ep *_ep)
         nuke(ep, -ESHUTDOWN);
 
         ep->desc = NULL;
+        ep->ep.desc = NULL;
         ep->stopped = 1;
         spin_unlock_irqrestore(&udc->lock, flags);
 
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
index 5af70fcce13..59777490a19 100644
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/goku_udc.c
@@ -235,6 +235,7 @@ static void ep_reset(struct goku_udc_regs __iomem *regs, struct goku_ep *ep)
 
         ep->ep.maxpacket = MAX_FIFO_SIZE;
         ep->desc = NULL;
+        ep->ep.desc = NULL;
         ep->stopped = 1;
         ep->irqs = 0;
         ep->dma = 0;
diff --git a/drivers/usb/gadget/langwell_udc.c b/drivers/usb/gadget/langwell_udc.c
index fa0fcc11263..a2bb5e476f5 100644
--- a/drivers/usb/gadget/langwell_udc.c
+++ b/drivers/usb/gadget/langwell_udc.c
@@ -492,6 +492,7 @@ static int langwell_ep_disable(struct usb_ep *_ep)
         nuke(ep, -ESHUTDOWN);
 
         ep->desc = NULL;
+        ep->ep.desc = NULL;
         ep->stopped = 1;
 
         spin_unlock_irqrestore(&dev->lock, flags);
diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c
index 8dd398b99e2..ec6009fc050 100644
--- a/drivers/usb/gadget/mv_udc_core.c
+++ b/drivers/usb/gadget/mv_udc_core.c
@@ -608,6 +608,7 @@ static int  mv_ep_disable(struct usb_ep *_ep)
         nuke(ep, -ESHUTDOWN);
 
         ep->desc = NULL;
+        ep->ep.desc = NULL;
         ep->stopped = 1;
 
         spin_unlock_irqrestore(&udc->lock, flags);
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 576cd8578b4..7d0835e4bb9 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -251,6 +251,7 @@ static int omap_ep_disable(struct usb_ep *_ep)
 
         spin_lock_irqsave(&ep->udc->lock, flags);
         ep->desc = NULL;
+        ep->ep.desc = NULL;
         nuke (ep, -ESHUTDOWN);
         ep->ep.maxpacket = ep->maxpacket;
         ep->has_dma = 0;
diff --git a/drivers/usb/gadget/pch_udc.c b/drivers/usb/gadget/pch_udc.c
index a992084d389..350dbcd9068 100644
--- a/drivers/usb/gadget/pch_udc.c
+++ b/drivers/usb/gadget/pch_udc.c
@@ -1742,6 +1742,7 @@ static int pch_udc_pcd_ep_disable(struct usb_ep *usbep)
         pch_udc_ep_disable(ep);
         pch_udc_disable_ep_interrupts(ep->dev, PCH_UDC_EPINT(ep->in, ep->num));
         ep->desc = NULL;
+        ep->ep.desc = NULL;
         INIT_LIST_HEAD(&ep->queue);
         spin_unlock_irqrestore(&ep->dev->lock, iflags);
         return 0;
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index dd470635f4f..33adf388427 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -283,6 +283,7 @@ static int pxa25x_ep_disable (struct usb_ep *_ep)
         pxa25x_ep_fifo_flush (_ep);
 
         ep->desc = NULL;
+        ep->ep.desc = NULL;
         ep->stopped = 1;
 
         local_irq_restore(flags);
@@ -1192,6 +1193,7 @@ static void udc_reinit(struct pxa25x_udc *dev)
                         list_add_tail (&ep->ep.ep_list, &dev->gadget.ep_list);
 
                 ep->desc = NULL;
+                ep->ep.desc = NULL;
                 ep->stopped = 0;
                 INIT_LIST_HEAD (&ep->queue);
                 ep->pio_irqs = 0;
diff --git a/drivers/usb/gadget/s3c-hsudc.c b/drivers/usb/gadget/s3c-hsudc.c
index 5e8729374fb..ace95f93368 100644
--- a/drivers/usb/gadget/s3c-hsudc.c
+++ b/drivers/usb/gadget/s3c-hsudc.c
@@ -817,6 +817,7 @@ static int s3c_hsudc_ep_disable(struct usb_ep *_ep)
         s3c_hsudc_nuke_ep(hsep, -ESHUTDOWN);
 
         hsep->desc = 0;
+        hsep->ep.desc = NULL;
         hsep->stopped = 1;
 
         spin_unlock_irqrestore(&hsudc->lock, flags);
@@ -1006,6 +1007,7 @@ static void s3c_hsudc_initep(struct s3c_hsudc *hsudc,
         hsep->ep.ops = &s3c_hsudc_ep_ops;
         hsep->fifo = hsudc->regs + S3C_BR(epnum);
         hsep->desc = 0;
+        hsep->ep.desc = NULL;
         hsep->stopped = 0;
         hsep->wedge = 0;
 
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c
index 3f87cb9344b..ab9c65e2c1d 100644
--- a/drivers/usb/gadget/s3c2410_udc.c
+++ b/drivers/usb/gadget/s3c2410_udc.c
@@ -1148,6 +1148,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 +1631,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);
         }