]> err.no Git - linux-2.6/commitdiff
sdhci: disable DMA for req, not completely
authorPierre Ossman <drzeus@drzeus.cx>
Mon, 28 Jul 2008 22:45:51 +0000 (00:45 +0200)
committerPierre Ossman <drzeus@drzeus.cx>
Fri, 1 Aug 2008 17:03:35 +0000 (19:03 +0200)
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>
drivers/mmc/host/sdhci.c

index be09739f692d1675f04ecd274345d240ce1c0810..9191aaf2e52c7aac506d37651b606088649232a2 100644 (file)
@@ -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),