diff options
Diffstat (limited to 'sound/soc/txx9/txx9aclc.c')
-rw-r--r-- | sound/soc/txx9/txx9aclc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/txx9/txx9aclc.c b/sound/soc/txx9/txx9aclc.c index 49cc7ea9a518..0e3452303ea6 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) | |||
160 | void __iomem *base = drvdata->base; | 160 | void __iomem *base = drvdata->base; |
161 | 161 | ||
162 | spin_unlock_irqrestore(&dmadata->dma_lock, flags); | 162 | spin_unlock_irqrestore(&dmadata->dma_lock, flags); |
163 | chan->device->device_terminate_all(chan); | 163 | chan->device->device_control(chan, DMA_TERMINATE_ALL, 0); |
164 | /* first time */ | 164 | /* first time */ |
165 | for (i = 0; i < NR_DMA_CHAIN; i++) { | 165 | for (i = 0; i < NR_DMA_CHAIN; i++) { |
166 | desc = txx9aclc_dma_submit(dmadata, | 166 | desc = txx9aclc_dma_submit(dmadata, |
@@ -268,7 +268,7 @@ static int txx9aclc_pcm_close(struct snd_pcm_substream *substream) | |||
268 | struct dma_chan *chan = dmadata->dma_chan; | 268 | struct dma_chan *chan = dmadata->dma_chan; |
269 | 269 | ||
270 | dmadata->frag_count = -1; | 270 | dmadata->frag_count = -1; |
271 | chan->device->device_terminate_all(chan); | 271 | chan->device->device_control(chan, DMA_TERMINATE_ALL, 0); |
272 | return 0; | 272 | return 0; |
273 | } | 273 | } |
274 | 274 | ||
@@ -397,7 +397,8 @@ static int txx9aclc_pcm_remove(struct platform_device *pdev) | |||
397 | struct dma_chan *chan = dmadata->dma_chan; | 397 | struct dma_chan *chan = dmadata->dma_chan; |
398 | if (chan) { | 398 | if (chan) { |
399 | dmadata->frag_count = -1; | 399 | dmadata->frag_count = -1; |
400 | chan->device->device_terminate_all(chan); | 400 | chan->device->device_control(chan, |
401 | DMA_TERMINATE_ALL, 0); | ||
401 | dma_release_channel(chan); | 402 | dma_release_channel(chan); |
402 | } | 403 | } |
403 | dev->dmadata[i].dma_chan = NULL; | 404 | dev->dmadata[i].dma_chan = NULL; |