diff options
author | Thomas Kleffel <tk@maintech.de> | 2008-06-30 17:40:27 -0400 |
---|---|---|
committer | Pierre Ossman <drzeus@drzeus.cx> | 2008-07-15 08:14:46 -0400 |
commit | bdbc9c3a8f7a7956611c970e262693faa95081a5 (patch) | |
tree | bea8dbbca97e548ac49a738a6162c86de229d139 /drivers/mmc/host/s3cmci.c | |
parent | ceb3ac252519f9ab318050c8ee842e62820d6731 (diff) |
Fix the request finalisation by ensuring the controller
is stopped.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Harald Welte <laforge@openmoko.org>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc/host/s3cmci.c')
-rw-r--r-- | drivers/mmc/host/s3cmci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c index 6070f36139bd..8c68b2e0dd6e 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c | |||
@@ -677,7 +677,7 @@ static void finalize_request(struct s3cmci_host *host) | |||
677 | 677 | ||
678 | /* Cleanup controller */ | 678 | /* Cleanup controller */ |
679 | writel(0, host->base + S3C2410_SDICMDARG); | 679 | writel(0, host->base + S3C2410_SDICMDARG); |
680 | writel(0, host->base + S3C2410_SDIDCON); | 680 | writel(S3C2410_SDIDCON_STOP, host->base + S3C2410_SDIDCON); |
681 | writel(0, host->base + S3C2410_SDICMDCON); | 681 | writel(0, host->base + S3C2410_SDICMDCON); |
682 | writel(0, host->base + host->sdiimsk); | 682 | writel(0, host->base + host->sdiimsk); |
683 | 683 | ||
@@ -803,7 +803,7 @@ static int s3cmci_setup_data(struct s3cmci_host *host, struct mmc_data *data) | |||
803 | dbg(host, dbg_err, | 803 | dbg(host, dbg_err, |
804 | "mci_setup_data() transfer stillin progress.\n"); | 804 | "mci_setup_data() transfer stillin progress.\n"); |
805 | 805 | ||
806 | writel(0, host->base + S3C2410_SDIDCON); | 806 | writel(S3C2410_SDIDCON_STOP, host->base + S3C2410_SDIDCON); |
807 | s3cmci_reset(host); | 807 | s3cmci_reset(host); |
808 | 808 | ||
809 | if ((stoptries--) == 0) { | 809 | if ((stoptries--) == 0) { |