[PATCH 5/5] ASoC: mxs: correct 'direction' of device_prep_dma_cyclic
Vinod Koul
vinod.koul at intel.com
Fri Dec 23 11:07:00 EST 2011
On Wed, 2011-12-14 at 15:47 +0800, Shawn Guo wrote:
> The commit 49920bc (dmaengine: add new enum dma_transfer_direction)
> changes the type of parameter 'direction' of device_prep_dma_cyclic
> from dma_data_direction to dma_transfer_direction.
>
> Signed-off-by: Shawn Guo <shawn.guo at linaro.org>
> ---
> sound/soc/mxs/mxs-pcm.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/sound/soc/mxs/mxs-pcm.c b/sound/soc/mxs/mxs-pcm.c
> index 0e12f4e..105f42a 100644
> --- a/sound/soc/mxs/mxs-pcm.c
> +++ b/sound/soc/mxs/mxs-pcm.c
> @@ -136,7 +136,7 @@ static int snd_mxs_pcm_hw_params(struct snd_pcm_substream *substream,
> iprtd->period_bytes * iprtd->periods,
> iprtd->period_bytes,
> substream->stream == SNDRV_PCM_STREAM_PLAYBACK ?
> - DMA_TO_DEVICE : DMA_FROM_DEVICE);
> + DMA_MEM_TO_DEV : DMA_DEV_TO_MEM);
> if (!iprtd->desc) {
> dev_err(&chan->dev->device, "cannot prepare slave dma\n");
> return -EINVAL;
Has this been applied in soc tree? I don't see it in linux-next or do
you want this to go thru slave-dma?
--
~Vinod
More information about the linux-arm-kernel
mailing list