OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f5a106d
)
ARM: mmci: complete the transaction on error
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Sun, 30 Jan 2011 21:03:50 +0000
(21:03 +0000)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Mon, 31 Jan 2011 10:53:23 +0000
(10:53 +0000)
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>
drivers/mmc/host/mmci.c
patch
|
blob
|
history
diff --git
a/drivers/mmc/host/mmci.c
b/drivers/mmc/host/mmci.c
index
b6fd6dc
..
175a623
100644
(file)
--- 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)