diff options
| author | Ido Shayevitz <idos@codeaurora.org> | 2012-02-08 13:56:48 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2012-02-24 12:22:38 +0200 |
| commit | f9c56cdd3905c96c600456203637bd7ec8ec6383 (patch) | |
| tree | cfa0cd39d0798a0c3e4b57bf2ce3e9e75922c769 /drivers/usb/gadget/pxa25x_udc.c | |
| parent | a003c187cac7a88101fe7f254bde6582865f7908 (diff) | |
| download | op-kernel-dev-f9c56cdd3905c96c600456203637bd7ec8ec6383.zip op-kernel-dev-f9c56cdd3905c96c600456203637bd7ec8ec6383.tar.gz | |
usb: gadget: Clear usb_endpoint_descriptor inside the struct usb_ep on disable
This fix a bug in f_serial, which expect the ep->desc to be NULL after
disabling an endpoint.
Cc: stable@vger.kernel.org
Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/pxa25x_udc.c')
| -rw-r--r-- | drivers/usb/gadget/pxa25x_udc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c index dd47063..33adf38 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; |
