git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ 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
[safe/jmp/linux-2.6]
/
drivers
/
mmc
/
host
/
atmel-mci.c
diff --git
a/drivers/mmc/host/atmel-mci.c
b/drivers/mmc/host/atmel-mci.c
index
fb279f4
..
df0e8a8
100644
(file)
--- a/
drivers/mmc/host/atmel-mci.c
+++ b/
drivers/mmc/host/atmel-mci.c
@@
-580,7
+580,7
@@
static void atmci_stop_dma(struct atmel_mci *host)
struct dma_chan *chan = host->data_chan;
if (chan) {
-
chan->device->device_terminate_all(chan
);
+
chan->device->device_control(chan, DMA_TERMINATE_ALL, 0
);
atmci_dma_cleanup(host);
} else {
/* Data transfer was stopped by the interrupt handler */