summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-11-11 16:28:05 +0100
committerChris Ball <cjb@laptop.org>2011-12-10 16:18:34 -0500
commite58f516ff4730c4047c3f104b061f7a03e9a263c (patch)
treedae62fe53aecf07f20001e5afd8e3400bc0dd614
parent053bf34f5aff499d7b595c500bbab5cbab3636e7 (diff)
downloadop-kernel-dev-e58f516ff4730c4047c3f104b061f7a03e9a263c.zip
op-kernel-dev-e58f516ff4730c4047c3f104b061f7a03e9a263c.tar.gz
mmc: mxcmmc: fix falling back to PIO
When we can't configure the dma channel we want to fall back to PIO. We do this by setting host->do_dma to zero. This does not work as do_dma is used to see whether dma can be used for the current transfer. Instead, we have to set host->dma to NULL. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Cc: <stable@kernel.org> Signed-off-by: Chris Ball <cjb@laptop.org>
-rw-r--r--drivers/mmc/host/mxcmmc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
index 325ea61..8e0fbe9 100644
--- a/drivers/mmc/host/mxcmmc.c
+++ b/drivers/mmc/host/mxcmmc.c
@@ -732,6 +732,7 @@ static void mxcmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
"failed to config DMA channel. Falling back to PIO\n");
dma_release_channel(host->dma);
host->do_dma = 0;
+ host->dma = NULL;
}
}
OpenPOWER on IntegriCloud