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>

diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index 6070f36139bd5e332ee9a503637b7f9ba169b8e3..8c68b2e0dd6e7fe4c9db39e6b4a9a53b4077a62c 100644 (file)
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -677,7 +677,7 @@ static void finalize_request(struct s3cmci_host *host)
 
        /* Cleanup controller */
        writel(0, host->base + S3C2410_SDICMDARG);
-       writel(0, host->base + S3C2410_SDIDCON);
+       writel(S3C2410_SDIDCON_STOP, host->base + S3C2410_SDIDCON);
        writel(0, host->base + S3C2410_SDICMDCON);
        writel(0, host->base + host->sdiimsk);
 
@@ -803,7 +803,7 @@ static int s3cmci_setup_data(struct s3cmci_host *host, struct mmc_data *data)
                dbg(host, dbg_err,
                    "mci_setup_data() transfer stillin progress.\n");
 
-               writel(0, host->base + S3C2410_SDIDCON);
+               writel(S3C2410_SDIDCON_STOP, host->base + S3C2410_SDIDCON);
                s3cmci_reset(host);
 
                if ((stoptries--) == 0) {