Commit ebd6d357 authored by Pierre Ossman's avatar Pierre Ossman
Browse files

sdhci: disable DMA for req, not completely 



The wrong flag was manipulated when an invalid sg list was given, turning
off DMA on the next (and all subsequent) request instead of the current
one.

Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
parent 4a3cba32

drivers/mmc/host/sdhci.c

+2 −2
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data) 
				 * us an invalid request.

				 */

				WARN_ON(1);

				host->flags &= ~SDHCI_USE_DMA;

				host->flags &= ~SDHCI_REQ_USE_DMA;

			} else {

				writel(host->adma_addr,

					host->ioaddr + SDHCI_ADMA_ADDRESS);
@@ -673,7 +673,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data) 
				 * us an invalid request.

				 */

				WARN_ON(1);

				host->flags &= ~SDHCI_USE_DMA;

				host->flags &= ~SDHCI_REQ_USE_DMA;

			} else {

				WARN_ON(sg_cnt != 1);

				writel(sg_dma_address(data->sg),