Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b63038d6 authored by Ulf Hansson's avatar Ulf Hansson Committed by Russell King
Browse files

ARM: 7214/1: mmc: mmci: Fixup handling of MCI_STARTBITERR 



The interrupt was previously enabled and then correctly cleared.
Now we also handle it correctly.

Cc: <stable@vger.kernel.org>
Tested-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@stericsson.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 55b02d2f

drivers/mmc/host/mmci.c

+5 −3
Original line number Diff line number Diff line
@@ -675,7 +675,8 @@ mmci_data_irq(struct mmci_host *host, struct mmc_data *data, 
	      unsigned int status)

{

	/* First check for errors */

	if (status & (MCI_DATACRCFAIL|MCI_DATATIMEOUT|MCI_TXUNDERRUN|MCI_RXOVERRUN)) {

	if (status & (MCI_DATACRCFAIL|MCI_DATATIMEOUT|MCI_STARTBITERR|

		      MCI_TXUNDERRUN|MCI_RXOVERRUN)) {

		u32 remain, success;



		/* Terminate the DMA transfer */
@@ -955,8 +956,9 @@ static irqreturn_t mmci_irq(int irq, void *dev_id) 
		dev_dbg(mmc_dev(host->mmc), "irq0 (data+cmd) %08x\n", status);



		data = host->data;

		if (status & (MCI_DATACRCFAIL|MCI_DATATIMEOUT|MCI_TXUNDERRUN|

			      MCI_RXOVERRUN|MCI_DATAEND|MCI_DATABLOCKEND) && data)

		if (status & (MCI_DATACRCFAIL|MCI_DATATIMEOUT|MCI_STARTBITERR|

			      MCI_TXUNDERRUN|MCI_RXOVERRUN|MCI_DATAEND|

			      MCI_DATABLOCKEND) && data)

			mmci_data_irq(host, data, status);



		cmd = host->cmd;