diff options
| author | Pierre Ossman <drzeus@drzeus.cx> | 2008-07-28 18:45:51 -0400 |
|---|---|---|
| committer | Pierre Ossman <drzeus@drzeus.cx> | 2008-08-01 13:03:35 -0400 |
| commit | ebd6d357848edb8709dd9bed4b93834d1b4d7044 (patch) | |
| tree | 37775d897ef1acb6e2488ca994958c7eb81f8d89 /drivers | |
| parent | 4a3cba32cb514168bb2516c045b178e6660421d1 (diff) | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index be09739f692d..9191aaf2e52c 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c | |||
| @@ -654,7 +654,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data) | |||
| 654 | * us an invalid request. | 654 | * us an invalid request. |
| 655 | */ | 655 | */ |
| 656 | WARN_ON(1); | 656 | WARN_ON(1); |
| 657 | host->flags &= ~SDHCI_USE_DMA; | 657 | host->flags &= ~SDHCI_REQ_USE_DMA; |
| 658 | } else { | 658 | } else { |
| 659 | writel(host->adma_addr, | 659 | writel(host->adma_addr, |
| 660 | host->ioaddr + SDHCI_ADMA_ADDRESS); | 660 | host->ioaddr + SDHCI_ADMA_ADDRESS); |
| @@ -673,7 +673,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data) | |||
| 673 | * us an invalid request. | 673 | * us an invalid request. |
| 674 | */ | 674 | */ |
| 675 | WARN_ON(1); | 675 | WARN_ON(1); |
| 676 | host->flags &= ~SDHCI_USE_DMA; | 676 | host->flags &= ~SDHCI_REQ_USE_DMA; |
| 677 | } else { | 677 | } else { |
| 678 | WARN_ON(sg_cnt != 1); | 678 | WARN_ON(sg_cnt != 1); |
| 679 | writel(sg_dma_address(data->sg), | 679 | writel(sg_dma_address(data->sg), |