Commit c1fa3426 authored Sep 09, 2013 by Ludovic Desroches Committed by Chris Ball Sep 25, 2013

mmc: atmel-mci: abort transfer on timeout error



When a software timeout occurs, the transfer is not stopped. In DMA case,
it causes DMA channel to be stuck because the transfer is still active
causing following transfers to be queued but not computed.

Cc: <stable@vger.kernel.org> # 3.9+
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Reported-by: Alexander Morozov <etesial@gmail.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

parent a27fbf2f

drivers/mmc/host/atmel-mci.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -589,6 +589,13 @@ static void atmci_timeout_timer(unsigned long data)
		if (host->mrq->cmd->data) {
		host->mrq->cmd->data->error = -ETIMEDOUT;
		host->data = NULL;
		/*
		* With some SDIO modules, sometimes DMA transfer hangs. If
		* stop_transfer() is not called then the DMA request is not
		* removed, following ones are queued and never computed.
		*/
		if (host->state == STATE_DATA_XFER)
		host->stop_transfer(host);
		} else {
		host->mrq->cmd->error = -ETIMEDOUT;
		host->cmd = NULL;