diff options
| author | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-12-13 16:58:43 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-18 23:07:22 +0000 |
| commit | 3b6e3c73851a9a4b0e6ed9d378206341dd65e8a5 (patch) | |
| tree | 70fd5ffac327cc9027ed6d904ebc9b27e2ddb73c /drivers/mmc | |
| parent | b63038d6f4ca5d1849ce01d9fc5bb9cb426dec73 (diff) | |
| download | kernel_samsung_smdk4412-3b6e3c73851a9a4b0e6ed9d378206341dd65e8a5.zip kernel_samsung_smdk4412-3b6e3c73851a9a4b0e6ed9d378206341dd65e8a5.tar.gz kernel_samsung_smdk4412-3b6e3c73851a9a4b0e6ed9d378206341dd65e8a5.tar.bz2 | |
ARM: 7220/1: mmc: mmci: Fixup error handling for dma
When getting a cmd irq during an ongoing data transfer
with dma, the dma job were never terminated. This is now
corrected.
Cc: <stable@vger.kernel.org>
Tested-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Per Forlin <per.forlin@stericsson.com>
Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/mmci.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 8265981..0726e59 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -755,8 +755,12 @@ mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd, } if (!cmd->data || cmd->error) { - if (host->data) + if (host->data) { + /* Terminate the DMA transfer */ + if (dma_inprogress(host)) + mmci_dma_data_error(host); mmci_stop_data(host); + } mmci_request_end(host, cmd->mrq); } else if (!(cmd->data->flags & MMC_DATA_READ)) { mmci_start_data(host, cmd->data); |