diff options
| author | Vinod Koul <vinod.koul@linux.intel.com> | 2011-11-17 10:24:38 +0100 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@linux.intel.com> | 2011-11-17 10:24:57 +0100 |
| commit | e0d23ef29ed637dc6bd739f590985746d9ad9caa (patch) | |
| tree | c5b5856dc88582697997bb10ccacad6fc2535465 /sound/soc/samsung | |
| parent | pch_dma: Support new device LAPIS Semiconductor ML7831 IOH (diff) | |
| parent | USB-renesas: move to dma_transfer_direction (diff) | |
| download | linux-e0d23ef29ed637dc6bd739f590985746d9ad9caa.tar.xz linux-e0d23ef29ed637dc6bd739f590985746d9ad9caa.zip | |
Merge branch 'dma_slave_direction' into next_test_dirn
resolved conflicts:
drivers/media/video/mx3_camera.c
Diffstat (limited to 'sound/soc/samsung')
| -rw-r--r-- | sound/soc/samsung/dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c index a68b26441784..d400ed0a71f2 100644 --- a/sound/soc/samsung/dma.c +++ b/sound/soc/samsung/dma.c @@ -86,7 +86,7 @@ static void dma_enqueue(struct snd_pcm_substream *substream) dma_info.cap = (samsung_dma_has_circular() ? DMA_CYCLIC : DMA_SLAVE); dma_info.direction = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK - ? DMA_TO_DEVICE : DMA_FROM_DEVICE); + ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM); dma_info.fp = audio_buffdone; dma_info.fp_param = substream; dma_info.period = prtd->dma_period; @@ -171,7 +171,7 @@ static int dma_hw_params(struct snd_pcm_substream *substream, dma_info.client = prtd->params->client; dma_info.direction = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK - ? DMA_TO_DEVICE : DMA_FROM_DEVICE); + ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM); dma_info.width = prtd->params->dma_size; dma_info.fifo = prtd->params->dma_addr; prtd->params->ch = prtd->params->ops->request( |