diff options
| author | Ben Dooks <ben@simtec.co.uk> | 2009-03-12 14:31:33 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-16 17:52:54 -0700 |
| commit | dc0e461f5446621c2d4b872cf58a6ad329286ba9 (patch) | |
| tree | 839cfd91afe020042b77c8a1170220ec3ead70a2 /drivers | |
| parent | d56e3f4ea3854531d1ab2bd6a490c3ea41c8d577 (diff) | |
| download | lwn-dc0e461f5446621c2d4b872cf58a6ad329286ba9.tar.gz lwn-dc0e461f5446621c2d4b872cf58a6ad329286ba9.zip | |
mmc: s3cmci: fix s3c2410_dma_config() arguments.
commit 7c48ed3383bfb2106694807361ec187fe8a4333d upstream.
The s3cmci driver is calling s3c2410_dma_config with incorrect data for
the DCON register. The S3C2410_DCON_HWTRIG is implicit in the channel
configuration and the device selection of S3C2410_DCON_CH0_SDI is
incorrect as the DMA system may not select channel 0.
Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Acked-by: Pierre Ossman <drzeus@drzeus.cx>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -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 ae16d845d746..42b70d7c3748 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c @@ -756,8 +756,7 @@ static void s3cmci_dma_setup(struct s3cmci_host *host, host->mem->start + host->sdidata); if (!setup_ok) { - s3c2410_dma_config(host->dma, 4, - (S3C2410_DCON_HWTRIG | S3C2410_DCON_CH0_SDI)); + s3c2410_dma_config(host->dma, 4, 0); s3c2410_dma_set_buffdone_fn(host->dma, s3cmci_dma_done_callback); s3c2410_dma_setflags(host->dma, S3C2410_DMAF_AUTOSTART); |