diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-30 16:03:50 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-31 05:53:23 -0500 |
commit | ccff9b51825b7335889b780bdf7de84ca803e291 (patch) | |
tree | 884b6114a8fef7fc60fe784de68faa23f41aa73a /drivers/mmc/host/mmci.c | |
parent | f5a106d9e2a5d947e106c3caace373ded1a695ed (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>
Diffstat (limited to 'drivers/mmc/host/mmci.c')
-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 b6fd6dcb41e7..175a623a6a29 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, | |||
319 | if (status & MCI_DATABLOCKEND) | 319 | if (status & MCI_DATABLOCKEND) |
320 | dev_err(mmc_dev(host->mmc), "stray MCI_DATABLOCKEND interrupt\n"); | 320 | dev_err(mmc_dev(host->mmc), "stray MCI_DATABLOCKEND interrupt\n"); |
321 | 321 | ||
322 | if (status & MCI_DATAEND) { | 322 | if (status & MCI_DATAEND || data->error) { |
323 | mmci_stop_data(host); | 323 | mmci_stop_data(host); |
324 | 324 | ||
325 | if (!data->error) | 325 | if (!data->error) |