From: Nicolin Chen Date: Tue, 19 Nov 2013 06:57:00 +0000 (+0800) Subject: ENGR00288421-4 mxc: asrc: keep map/unmap parameters symmetic X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fad1c9c08ff32a706624fb52d72e78c68282dda1;p=karo-tx-linux.git ENGR00288421-4 mxc: asrc: keep map/unmap parameters symmetic We are using DEV_TO_MEM for dma_map but MEM_TO_DEV for dma_unmap, thus fix it. It also adds missing device pointer since assigning it to dma_free_coherent(). Acked-by: Wang Shengjiu Signed-off-by: Nicolin Chen --- diff --git a/drivers/mxc/asrc/mxc_asrc.c b/drivers/mxc/asrc/mxc_asrc.c index 377de8f90725..7c1dd8fd3076 100644 --- a/drivers/mxc/asrc/mxc_asrc.c +++ b/drivers/mxc/asrc/mxc_asrc.c @@ -668,7 +668,7 @@ static void asrc_output_dma_callback(void *data) struct asrc_pair_params *params = (struct asrc_pair_params *)data; dma_unmap_sg(NULL, params->output_sg, params->output_sg_nodes, - DMA_MEM_TO_DEV); + DMA_DEV_TO_MEM); complete(¶ms->output_complete); } @@ -797,7 +797,7 @@ static int mxc_allocate_dma_buf(struct asrc_pair_params *params) } output_a->dma_paddr = virt_to_dma(NULL, output_a->dma_vaddr); - last_period->dma_vaddr = dma_alloc_coherent(NULL, + last_period->dma_vaddr = dma_alloc_coherent(asrc->dev, 1024 * params->last_period_sample, &last_period->dma_paddr, GFP_KERNEL); if (!last_period->dma_vaddr) { @@ -1146,7 +1146,7 @@ static void asrc_polling_debug(struct asrc_pair_params *params) dma_unmap_sg(NULL, params->input_sg, params->input_sg_nodes, DMA_MEM_TO_DEV); dma_unmap_sg(NULL, params->output_sg, params->output_sg_nodes, - DMA_MEM_TO_DEV); + DMA_DEV_TO_MEM); complete(¶ms->input_complete); complete(¶ms->lastperiod_complete);