Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Ulf Hansson and committed by
Russell King
3b6e3c73 b63038d6

+5 -1
+5 -1
drivers/mmc/host/mmci.c
··· 755 755 } 756 756 757 757 if (!cmd->data || cmd->error) { 758 - if (host->data) 758 + if (host->data) { 759 + /* Terminate the DMA transfer */ 760 + if (dma_inprogress(host)) 761 + mmci_dma_data_error(host); 759 762 mmci_stop_data(host); 763 + } 760 764 mmci_request_end(host, cmd->mrq); 761 765 } else if (!(cmd->data->flags & MMC_DATA_READ)) { 762 766 mmci_start_data(host, cmd->data);