Commit ebd6d357 authored by Pierre Ossman's avatar Pierre Ossman

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
...@@ -654,7 +654,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data) ...@@ -654,7 +654,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data)
* us an invalid request. * us an invalid request.
*/ */
WARN_ON(1); WARN_ON(1);
host->flags &= ~SDHCI_USE_DMA; host->flags &= ~SDHCI_REQ_USE_DMA;
} else { } else {
writel(host->adma_addr, writel(host->adma_addr,
host->ioaddr + SDHCI_ADMA_ADDRESS); host->ioaddr + SDHCI_ADMA_ADDRESS);
...@@ -673,7 +673,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data) ...@@ -673,7 +673,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data)
* us an invalid request. * us an invalid request.
*/ */
WARN_ON(1); WARN_ON(1);
host->flags &= ~SDHCI_USE_DMA; host->flags &= ~SDHCI_REQ_USE_DMA;
} else { } else {
WARN_ON(sg_cnt != 1); WARN_ON(sg_cnt != 1);
writel(sg_dma_address(data->sg), writel(sg_dma_address(data->sg),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment