diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-30 21:03:50 +0000 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-01-31 13:46:11 -0500 |
| commit | c870c37bd9f85cd37eaa3631e39549336cfc7390 (patch) | |
| tree | d330538ca0ddc4f13d2cb330a2fa57851fa2a541 | |
| parent | a4b3db1349d9b19cc013d9d5e3df6e71d086d23e (diff) | |
ARM: mmci: complete the transaction on error
When we encounter an error, make sure we complete the transaction
otherwise we'll leave the request dangling.
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
(cherry picked from commit ccff9b51825b7335889b780bdf7de84ca803e291)
| -rw-r--r-- | drivers/mmc/host/mmci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index b6fd6dcb41e..175a623a6a2 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -319,7 +319,7 @@ mmci_data_irq(struct mmci_host *host, struct mmc_data *data, if (status & MCI_DATABLOCKEND) dev_err(mmc_dev(host->mmc), "stray MCI_DATABLOCKEND interrupt\n"); - if (status & MCI_DATAEND) { + if (status & MCI_DATAEND || data->error) { mmci_stop_data(host); if (!data->error) |