Commit 3b6e3c73 authored Dec 13, 2011 by Ulf Hansson Committed by Russell King Dec 18, 2011

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>

parent b63038d6

drivers/mmc/host/mmci.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message