git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[pandora-kernel.git]
/
sound
/
soc
/
txx9
/
txx9aclc.c
diff --git
a/sound/soc/txx9/txx9aclc.c
b/sound/soc/txx9/txx9aclc.c
index
49cc7ea
..
0e34523
100644
(file)
--- 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);
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, 0
);
/* first time */
for (i = 0; i < NR_DMA_CHAIN; i++) {
desc = txx9aclc_dma_submit(dmadata,
/* 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;
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, 0
);
return 0;
}
return 0;
}
@@
-397,7
+397,8
@@
static int txx9aclc_pcm_remove(struct platform_device *pdev)
struct dma_chan *chan = dmadata->dma_chan;
if (chan) {
dmadata->frag_count = -1;
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, 0);
dma_release_channel(chan);
}
dev->dmadata[i].dma_chan = NULL;
dma_release_channel(chan);
}
dev->dmadata[i].dma_chan = NULL;