[alsa-devel] [PATCH 1/1] ASoC: fsl_asrc: use dma_transfer_direction enum when calling dmaengine_prep_dma_cyclic
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(-)
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;
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.
The patch
ASoC: fsl_asrc_dma: use correct direction enum type
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
From 24dbd9edb668e2376ce871199f5ee4fd59c62276 Mon Sep 17 00:00:00 2001
From: Stefan Agner stefan@agner.ch Date: Wed, 19 Apr 2017 23:36:07 -0700 Subject: [PATCH] ASoC: fsl_asrc_dma: use correct direction enum type
The direction argument is of type enum dma_transfer_direction, and not enum dma_data_direction. The enumeration values are the same so this did not had an effect in practise.
Signed-off-by: Stefan Agner stefan@agner.ch Acked-by: Nicolin Chen nicoleotsuka@gmail.com Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/fsl/fsl_asrc_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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;
participants (4)
-
Fabio Estevam -
Mark Brown -
Nicolas Iooss -
Nicolin Chen