summaryrefslogtreecommitdiff
path: root/drivers/mmc/core/core.c
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2019-02-28 09:16:18 +0100
committerUlf Hansson <ulf.hansson@linaro.org>2019-02-28 09:16:18 +0100
commit82b6248705cccc4341b4c1d4a80a70f018198db0 (patch)
tree1341700e8cad07b71f90ad41826e6332adabe763 /drivers/mmc/core/core.c
parentad9be7fff3e729287f61a2a5e811c03090003fff (diff)
parentc53336c8f5f29043fded57912cc06c24e12613d7 (diff)
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/mmc/core/core.c')
-rw-r--r--drivers/mmc/core/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 2d415cb1889a..ebf1a08cd359 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -95,7 +95,7 @@ static void mmc_should_fail_request(struct mmc_host *host,
if (!data)
return;
- if (cmd->error || data->error ||
+ if ((cmd && cmd->error) || data->error ||
!should_fail(&host->fail_mmc_request, data->blksz * data->blocks))
return;