diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-12 20:33:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-12 20:33:21 -0400 |
| commit | 480c93df5b99699390f93a7024c9f60d09da0e96 (patch) | |
| tree | b93b6c8c71c5f2e716dd05b126e01ef4e20ff0af /drivers/mmc/host/s3cmci.c | |
| parent | aecfcde920da8d32949f6cbbc1fc051b4ef9e7be (diff) | |
| parent | d820ac4c2fa881079e6b689d2098adce337558ae (diff) | |
Merge branch 'core/locking' into tracing/ftrace
Diffstat (limited to 'drivers/mmc/host/s3cmci.c')
| -rw-r--r-- | drivers/mmc/host/s3cmci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c index f4a67c65d301..2db166b7096f 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c | |||
| @@ -793,8 +793,7 @@ static void s3cmci_dma_setup(struct s3cmci_host *host, | |||
| 793 | host->mem->start + host->sdidata); | 793 | host->mem->start + host->sdidata); |
| 794 | 794 | ||
| 795 | if (!setup_ok) { | 795 | if (!setup_ok) { |
| 796 | s3c2410_dma_config(host->dma, 4, | 796 | s3c2410_dma_config(host->dma, 4, 0); |
| 797 | (S3C2410_DCON_HWTRIG | S3C2410_DCON_CH0_SDI)); | ||
| 798 | s3c2410_dma_set_buffdone_fn(host->dma, | 797 | s3c2410_dma_set_buffdone_fn(host->dma, |
| 799 | s3cmci_dma_done_callback); | 798 | s3cmci_dma_done_callback); |
| 800 | s3c2410_dma_setflags(host->dma, S3C2410_DMAF_AUTOSTART); | 799 | s3c2410_dma_setflags(host->dma, S3C2410_DMAF_AUTOSTART); |