summaryrefslogtreecommitdiff
path: root/drivers/mmc
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-06-14 09:57:01 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-06-14 09:57:00 -0700
commitf1126aa337bea809df8a5885adec60b91f6b9ed4 (patch)
treedc8229acfb850a9845ec175e45f1850953a0dddb /drivers/mmc
parent959abd171bdcc8163faaaae5b58927f3f944e1b9 (diff)
parentddd73093288e41fb166cec3ddeee9a095e64fb96 (diff)
Merge "mmc: sd: return error information of sd_init_card incase of failure"
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/core/sd.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 5b4d5d74fe55..5033107f6e26 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -1283,6 +1283,11 @@ static int _mmc_sd_resume(struct mmc_host *host)
#else
err = mmc_sd_init_card(host, host->card->ocr, host->card);
#endif
+ if (err) {
+ pr_err("%s: %s: mmc_sd_init_card_failed (%d)\n",
+ mmc_hostname(host), __func__, err);
+ goto out;
+ }
mmc_card_clr_suspended(host->card);
if (host->card->sdr104_blocked)