diff options
| author | Kishon Vijay Abraham I <kishon@ti.com> | 2013-03-15 18:58:50 +0530 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2013-03-18 10:18:28 +0200 |
| commit | 06d9db7273c7bd5b07624b313faeea57a4b31056 (patch) | |
| tree | bcb20fc04852788f9fcabbf88585d26d18bd309d /drivers/usb | |
| parent | 273daf2f2ab9f42d82f017b20fcf902ec8d7cffa (diff) | |
| download | linux-stable-06d9db7273c7bd5b07624b313faeea57a4b31056.tar.gz linux-stable-06d9db7273c7bd5b07624b313faeea57a4b31056.tar.bz2 linux-stable-06d9db7273c7bd5b07624b313faeea57a4b31056.zip | |
usb: musb: gadget: do *unmap_dma_buffer* only for valid DMA addr
musb does not use DMA buffer for ep0 but it uses the same giveback
function *musb_g_giveback* for all endpoints (*musb_g_ep0_giveback* calls
*musb_g_giveback*). So for ep0 case request.dma will be '0'
and will result in kernel OOPS if tried to *unmap_dma_buffer* for requests in
ep0. Fixed it by doing *unmap_dma_buffer* only for valid DMA addr and
checking that musb_ep->dma is valid when unmapping.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/musb/musb_gadget.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index be18537c5f14..83eddedcd9be 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c @@ -141,7 +141,9 @@ static inline void map_dma_buffer(struct musb_request *request, static inline void unmap_dma_buffer(struct musb_request *request, struct musb *musb) { - if (!is_buffer_mapped(request)) + struct musb_ep *musb_ep = request->ep; + + if (!is_buffer_mapped(request) || !musb_ep->dma) return; if (request->request.dma == DMA_ADDR_INVALID) { @@ -195,7 +197,10 @@ __acquires(ep->musb->lock) ep->busy = 1; spin_unlock(&musb->lock); - unmap_dma_buffer(req, musb); + + if (!dma_mapping_error(&musb->g.dev, request->dma)) + unmap_dma_buffer(req, musb); + if (request->status == 0) dev_dbg(musb->controller, "%s done request %p, %d/%d\n", ep->end_point.name, request, |