diff options
| author | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-12-13 16:58:43 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-06 14:13:56 -0800 |
| commit | 9267a9e850bf6c52dd7c95f3978dc78a1d3ad1a1 (patch) | |
| tree | fc0a8304cb0919607c24ba85b32c062ca0eef674 /drivers/mmc | |
| parent | bc23ab0861a252bdbdf3bd982c37a6a96c2ceba6 (diff) | |
| download | kernel_samsung_smdk4412-9267a9e850bf6c52dd7c95f3978dc78a1d3ad1a1.zip kernel_samsung_smdk4412-9267a9e850bf6c52dd7c95f3978dc78a1d3ad1a1.tar.gz kernel_samsung_smdk4412-9267a9e850bf6c52dd7c95f3978dc78a1d3ad1a1.tar.bz2 | |
ARM: 7220/1: mmc: mmci: Fixup error handling for dma
commit 3b6e3c73851a9a4b0e6ed9d378206341dd65e8a5 upstream.
When getting a cmd irq during an ongoing data transfer
with dma, the dma job were never terminated. This is now
corrected.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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 03a05fd..9394d0b 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -637,8 +637,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); |