| Message ID | 20170115124331.3546-1-nicolas.iooss_linux@m4x.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 24dbd9edb668e2376ce871199f5ee4fd59c62276 |
| Headers | show |
On Sun, Jan 15, 2017 at 10:43 AM, Nicolas Iooss <nicolas.iooss_linux@m4x.org> wrote: > When fsl_asrc_dma_prepare_and_submit() calls > dmaengine_prep_dma_cyclic(), it uses either DMA_TO_DEVICE or > DMA_FROM_DEVICE. These values are both items of dma_data_direction enum, > not of dma_data_direction enum, which is the type expected by > dmaengine_prep_dma_cyclic(). > > Replace DMA_TO_DEVICE with DMA_MEM_TO_DEV and DMA_FROM_DEVICE with > DMA_DEV_TO_MEM to fix this type mismatch issue. > > Signed-off-by: Nicolas Iooss <nicolas.iooss_linux@m4x.org> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
On Sun, Jan 15, 2017 at 01:43:31PM +0100, Nicolas Iooss wrote: > When fsl_asrc_dma_prepare_and_submit() calls > dmaengine_prep_dma_cyclic(), it uses either DMA_TO_DEVICE or > DMA_FROM_DEVICE. These values are both items of dma_data_direction enum, > not of dma_data_direction enum, which is the type expected by > dmaengine_prep_dma_cyclic(). > > Replace DMA_TO_DEVICE with DMA_MEM_TO_DEV and DMA_FROM_DEVICE with > DMA_DEV_TO_MEM to fix this type mismatch issue. > > Signed-off-by: Nicolas Iooss <nicolas.iooss_linux@m4x.org> Acked-by: Nicolin Chen <nicoleotsuka@gmail.com> Thanks.
diff --git a/sound/soc/fsl/fsl_asrc_dma.c b/sound/soc/fsl/fsl_asrc_dma.c index dc30d780f874..282d841840b1 100644 --- a/sound/soc/fsl/fsl_asrc_dma.c +++ b/sound/soc/fsl/fsl_asrc_dma.c @@ -76,7 +76,7 @@ static int fsl_asrc_dma_prepare_and_submit(struct snd_pcm_substream *substream) pair->dma_chan[!dir], runtime->dma_addr, snd_pcm_lib_buffer_bytes(substream), snd_pcm_lib_period_bytes(substream), - dir == OUT ? DMA_TO_DEVICE : DMA_FROM_DEVICE, flags); + dir == OUT ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM, flags); if (!pair->desc[!dir]) { dev_err(dev, "failed to prepare slave DMA for Front-End\n"); return -ENOMEM;
When fsl_asrc_dma_prepare_and_submit() calls dmaengine_prep_dma_cyclic(), it uses either DMA_TO_DEVICE or DMA_FROM_DEVICE. These values are both items of dma_data_direction enum, not of dma_data_direction enum, which is the type expected by dmaengine_prep_dma_cyclic(). Replace DMA_TO_DEVICE with DMA_MEM_TO_DEV and DMA_FROM_DEVICE with DMA_DEV_TO_MEM to fix this type mismatch issue. Signed-off-by: Nicolas Iooss <nicolas.iooss_linux@m4x.org> --- sound/soc/fsl/fsl_asrc_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)