Re: [PATCH 2/4] usb: musb: gadget: do *unmap_dma_buffer* only forvalid DMA addr

From: Felipe Balbi
Date: Fri Mar 15 2013 - 10:30:38 EST


On Fri, Mar 15, 2013 at 06:58:50PM +0530, Kishon Vijay Abraham I wrote:
> 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.
>
> Signed-off-by: Kishon Vijay Abraham I <kishon@xxxxxx>
> ---
> drivers/usb/musb/musb_gadget.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
> index c454375..ec3cf29 100644
> --- a/drivers/usb/musb/musb_gadget.c
> +++ b/drivers/usb/musb/musb_gadget.c
> @@ -107,7 +107,10 @@ __acquires(ep->musb->lock)
>
> ep->busy = 1;
> spin_unlock(&musb->lock);
> - unmap_dma_buffer(req, musb);
> +
> + if (request->dma)

I have changed to if (!dma_mapping_error(request->dma)), is it alright ?

--
balbi

Attachment: signature.asc
Description: Digital signature