projects
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mmc-updates-for-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel...
[linux.git]
/
drivers
/
mmc
/
host
/
dw_mmc.c
diff --git
a/drivers/mmc/host/dw_mmc.c
b/drivers/mmc/host/dw_mmc.c
index c204b7d1532c0f1c910b25a7435d3f12c8435732..cced599d5aebe22aef357fd427a6aa03d7edaa79 100644
(file)
--- a/
drivers/mmc/host/dw_mmc.c
+++ b/
drivers/mmc/host/dw_mmc.c
@@
-1345,7
+1345,7
@@
static void dw_mci_tasklet_func(unsigned long priv)
if (!err) {
if (!data->stop || mrq->sbc) {
- if (mrq->sbc)
+ if (mrq->sbc
&& data->stop
)
data->stop->error = 0;
dw_mci_request_end(host, mrq);
goto unlock;