]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
mmc: mxcmmc: fix falling back to PIO
authorSascha Hauer <s.hauer@pengutronix.de>
Fri, 11 Nov 2011 15:28:05 +0000 (16:28 +0100)
committerChris Ball <cjb@laptop.org>
Fri, 11 Nov 2011 16:11:42 +0000 (11:11 -0500)
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>
drivers/mmc/host/mxcmmc.c

index f48743de467301cffd1dd423a413b419014f25d9..1efcef0995fdb939b975bc07e5624a26a5333882 100644 (file)
@@ -731,6 +731,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;
                }
        }