diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-23 19:26:00 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-23 19:26:00 +0100 |
| commit | 9eb8ae727dcb9f2530a895ee6b3496592853709d (patch) | |
| tree | 2d72cfcad6f9a79074eaf180033706fd8aa600b5 /sound/soc/omap/omap-pcm.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-dev-9eb8ae727dcb9f2530a895ee6b3496592853709d.tar.xz linux-dev-9eb8ae727dcb9f2530a895ee6b3496592853709d.zip | |
Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
Diffstat (limited to 'sound/soc/omap/omap-pcm.c')
| -rw-r--r-- | sound/soc/omap/omap-pcm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index c8e272f9c2de..c28e042f2208 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c @@ -118,8 +118,9 @@ static int omap_pcm_open(struct snd_pcm_substream *substream) dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream); - return snd_dmaengine_pcm_open(substream, omap_dma_filter_fn, - dma_data->filter_data); + return snd_dmaengine_pcm_open_request_chan(substream, + omap_dma_filter_fn, + dma_data->filter_data); } static int omap_pcm_mmap(struct snd_pcm_substream *substream, @@ -135,7 +136,7 @@ static int omap_pcm_mmap(struct snd_pcm_substream *substream, static struct snd_pcm_ops omap_pcm_ops = { .open = omap_pcm_open, - .close = snd_dmaengine_pcm_close, + .close = snd_dmaengine_pcm_close_release_chan, .ioctl = snd_pcm_lib_ioctl, .hw_params = omap_pcm_hw_params, .hw_free = omap_pcm_hw_free, |