diff options
| author | Guennadi Liakhovetski | 2010-11-11 12:19:47 +0100 |
|---|---|---|
| committer | Chris Ball | 2011-01-09 05:52:28 +0100 |
| commit | ef17fee1e559b3faeb6f89963e78ad47731d18a1 (patch) | |
| tree | a2cef08fdbf4f922c10bd9b6ecfd67b5c1d0a4d2 /drivers/mmc/host/tmio_mmc.h | |
| parent | mmc: tmio_mmc: allow multi-element scatter-gather lists (diff) | |
| download | kernel-qcow2-linux-ef17fee1e559b3faeb6f89963e78ad47731d18a1.tar.gz kernel-qcow2-linux-ef17fee1e559b3faeb6f89963e78ad47731d18a1.tar.xz kernel-qcow2-linux-ef17fee1e559b3faeb6f89963e78ad47731d18a1.zip | |
mmc: tmio_mmc: fix PIO fallback on DMA descriptor allocation failure
The easiest way to fall back to PIO, when a DMA descriptor allocation
fails is to disable DMA on the controller but continue with the current
request in PIO mode. This way tmio_mmc_start_dma() can become void, since
it cannot be failing any more. The current version is also broken: it is
testing a wrong pointer and thus failing to recognise, that a descriptor
allocation wasn't successful.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host/tmio_mmc.h')
| -rw-r--r-- | drivers/mmc/host/tmio_mmc.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index 0fedc78e3ea5..0b7d9162c1b5 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -112,9 +112,7 @@ struct tmio_mmc_host { struct tasklet_struct dma_complete; struct tasklet_struct dma_issue; #ifdef CONFIG_TMIO_MMC_DMA - struct dma_async_tx_descriptor *desc; unsigned int dma_sglen; - dma_cookie_t cookie; #endif }; |