diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-23 20:26:00 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-23 20:26:00 +0200 |
| commit | 9eb8ae727dcb9f2530a895ee6b3496592853709d (patch) | |
| tree | 2d72cfcad6f9a79074eaf180033706fd8aa600b5 /sound/soc/atmel/atmel-pcm-dma.c | |
| parent | Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next (diff) | |
| parent | ASoC: generic-dmaengine-pcm: call dma_request_slave_channel() (diff) | |
| download | linux-9eb8ae727dcb9f2530a895ee6b3496592853709d.tar.xz linux-9eb8ae727dcb9f2530a895ee6b3496592853709d.zip | |
Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
Diffstat (limited to 'sound/soc/atmel/atmel-pcm-dma.c')
| -rw-r--r-- | sound/soc/atmel/atmel-pcm-dma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/atmel/atmel-pcm-dma.c b/sound/soc/atmel/atmel-pcm-dma.c index bb07989762d5..1d38fd0bc4e2 100644 --- a/sound/soc/atmel/atmel-pcm-dma.c +++ b/sound/soc/atmel/atmel-pcm-dma.c @@ -155,7 +155,7 @@ static int atmel_pcm_hw_params(struct snd_pcm_substream *substream, if (ssc->pdev) sdata = ssc->pdev->dev.platform_data; - ret = snd_dmaengine_pcm_open(substream, filter, sdata); + ret = snd_dmaengine_pcm_open_request_chan(substream, filter, sdata); if (ret) { pr_err("atmel-pcm: dmaengine pcm open failed\n"); return -EINVAL; @@ -171,7 +171,7 @@ static int atmel_pcm_hw_params(struct snd_pcm_substream *substream, return 0; err: - snd_dmaengine_pcm_close(substream); + snd_dmaengine_pcm_close_release_chan(substream); return ret; } @@ -197,7 +197,7 @@ static int atmel_pcm_open(struct snd_pcm_substream *substream) static struct snd_pcm_ops atmel_pcm_ops = { .open = atmel_pcm_open, - .close = snd_dmaengine_pcm_close, + .close = snd_dmaengine_pcm_close_release_chan, .ioctl = snd_pcm_lib_ioctl, .hw_params = atmel_pcm_hw_params, .prepare = atmel_pcm_dma_prepare, |