Przeglądaj źródła

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: Pierre Ossman <drzeus@drzeus.cx>
Pierre Ossman 17 lat temu
rodzic
commit
ebd6d35784
1 zmienionych plików z 2 dodań i 2 usunięć
  1. 2 2
      drivers/mmc/host/sdhci.c

+ 2 - 2
drivers/mmc/host/sdhci.c

@@ -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)
 				 * 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),