diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-04-18 16:24:31 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-04-18 16:24:31 +0200 |
| commit | 8dd2b66d1a961231685a3bfe5937c85d846fbf5d (patch) | |
| tree | 8117553488bf4ef09b048a4b343cf37cc16bf46d /sound/soc/spear | |
| parent | 126825e7ea271ae8e3172e10ca1fc22c908b5385 (diff) | |
| parent | 24568ea4bef5ab8106206eddf5512434421c00ed (diff) | |
Merge tag 'asoc-v3.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: More updates for v3.10
The main additional change here is Lars-Peter's DMA work plus the
platform conversions which have been tested - getting this in mainline
will make life easier for development after the merge window. These
factor a large chunk of code out of the drivers for the platforms using
dmaengine, greatly simplifying development.
Diffstat (limited to 'sound/soc/spear')
| -rw-r--r-- | sound/soc/spear/spear_pcm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/spear/spear_pcm.c b/sound/soc/spear/spear_pcm.c index bfbcc1fcfe6f..2fbd4899d8ef 100644 --- a/sound/soc/spear/spear_pcm.c +++ b/sound/soc/spear/spear_pcm.c @@ -64,7 +64,8 @@ static int spear_pcm_open(struct snd_pcm_substream *substream) if (ret) return ret; - return snd_dmaengine_pcm_open(substream, dma_data->filter, dma_data) + return snd_dmaengine_pcm_open_request_chan(substream, dma_data->filter, + dma_data); } static int spear_pcm_mmap(struct snd_pcm_substream *substream, @@ -79,7 +80,7 @@ static int spear_pcm_mmap(struct snd_pcm_substream *substream, static struct snd_pcm_ops spear_pcm_ops = { .open = spear_pcm_open, - .close = snd_dmaengine_pcm_close, + .close = snd_dmaengine_pcm_close_release_chan, .ioctl = snd_pcm_lib_ioctl, .hw_params = spear_pcm_hw_params, .hw_free = spear_pcm_hw_free, |