diff options
| author |   Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2013-06-19 17:38:15 +0200 |
|---|---|---|
| committer |   Felipe Balbi <balbi@ti.com> | 2013-07-29 13:53:23 +0300 |
| commit | 23a53d9008251825a4c8eea64503ed676e1d0f04 (patch) | |
| tree | b881117d0ba907e072bc819c8009eab20a0767a0 /drivers/usb/musb | |
| parent | usb: musb: core: call dma_controller_destroy() in the err path (diff) | |
| download | linux-dev-23a53d9008251825a4c8eea64503ed676e1d0f04.tar.xz linux-dev-23a53d9008251825a4c8eea64503ed676e1d0f04.zip | |
usb: musb: unmap reqs in musb_gadget_queue()'s error case
If the descriptor is missing the reqeust is never unmapped. This patch
changes this and renames the cleanup label to unlock since there is no
cleanup done. The cleanup would revert the allocation of ressource (i.e.
this dma mapping) but it does not, it simply unlocks and returns.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/musb')
| -rw-r--r-- | drivers/usb/musb/musb_gadget.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index 0414bc19d009..96632f9e3eeb 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c @@ -1266,7 +1266,8 @@ static int musb_gadget_queue(struct usb_ep *ep, struct usb_request *req, dev_dbg(musb->controller, "req %p queued to %s while ep %s\n", req, ep->name, "disabled"); status = -ESHUTDOWN; - goto cleanup; + unmap_dma_buffer(request, musb); + goto unlock; } /* add request to the list */ @@ -1276,7 +1277,7 @@ static int musb_gadget_queue(struct usb_ep *ep, struct usb_request *req, if (!musb_ep->busy && &request->list == musb_ep->req_list.next) musb_ep_restart(musb, request); -cleanup: +unlock: spin_unlock_irqrestore(&musb->lock, lockflags); return status; } |