diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-05 09:29:14 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-05 09:29:14 +1000 |
| commit | 219b1bc0edf924913f6df7fe2e04b8297a5f699b (patch) | |
| tree | 2a09dee88c3c71ae5d2075ecbef4dfa8c2521b0c /sound | |
| parent | 53822b5d574f1c596ce52b5371dc51b54b94b614 (diff) | |
| parent | e393b82d183bad34219c123c15de4f082844afda (diff) | |
Merge remote branch 'async_tx/next'
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/txx9/txx9aclc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/txx9/txx9aclc.c b/sound/soc/txx9/txx9aclc.c index 49cc7ea9a518..7082cb8045f2 100644 --- a/sound/soc/txx9/txx9aclc.c +++ b/sound/soc/txx9/txx9aclc.c @@ -160,7 +160,7 @@ static void txx9aclc_dma_tasklet(unsigned long data) void __iomem *base = drvdata->base; spin_unlock_irqrestore(&dmadata->dma_lock, flags); - chan->device->device_terminate_all(chan); + chan->device->device_control(chan, DMA_TERMINATE_ALL); /* first time */ for (i = 0; i < NR_DMA_CHAIN; i++) { desc = txx9aclc_dma_submit(dmadata, @@ -268,7 +268,7 @@ static int txx9aclc_pcm_close(struct snd_pcm_substream *substream) struct dma_chan *chan = dmadata->dma_chan; dmadata->frag_count = -1; - chan->device->device_terminate_all(chan); + chan->device->device_control(chan, DMA_TERMINATE_ALL); return 0; } @@ -397,7 +397,7 @@ static int txx9aclc_pcm_remove(struct platform_device *pdev) struct dma_chan *chan = dmadata->dma_chan; if (chan) { dmadata->frag_count = -1; - chan->device->device_terminate_all(chan); + chan->device->device_control(chan, DMA_TERMINATE_ALL); dma_release_channel(chan); } dev->dmadata[i].dma_chan = NULL; |