From: Shawn Guo Date: Wed, 14 Dec 2011 07:47:46 +0000 (+0800) Subject: ASoC: mxs: correct 'direction' of device_prep_dma_cyclic X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dbec3b30a601791717bc5bb827e210c3b5d6e067;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git ASoC: mxs: correct 'direction' of device_prep_dma_cyclic 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 Acked-by: Dong Aisheng Signed-off-by: Mark Brown --- diff --git a/sound/soc/mxs/mxs-pcm.c b/sound/soc/mxs/mxs-pcm.c index f39d7dd9fbcb..5dfd3250ddf1 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;