projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'spi/for-next'
[deliverable/linux.git]
/
drivers
/
mmc
/
core
/
mmc.c
diff --git
a/drivers/mmc/core/mmc.c
b/drivers/mmc/core/mmc.c
index f2d185cf8a8ba52e8f68651c2c517e55313c9d57..3486bc7fbb64a67a4cf1156c2ac7652541ef60bb 100644
(file)
--- a/
drivers/mmc/core/mmc.c
+++ b/
drivers/mmc/core/mmc.c
@@
-1029,6
+1029,10
@@
static int mmc_select_hs(struct mmc_card *card)
err = mmc_switch_status(card);
}
err = mmc_switch_status(card);
}
+ if (err)
+ pr_warn("%s: switch to high-speed failed, err:%d\n",
+ mmc_hostname(card->host), err);
+
return err;
}
return err;
}
@@
-1265,11
+1269,8
@@
static int mmc_select_hs400es(struct mmc_card *card)
/* Switch card to HS mode */
err = mmc_select_hs(card);
/* Switch card to HS mode */
err = mmc_select_hs(card);
- if (err) {
- pr_err("%s: switch to high-speed failed, err:%d\n",
- mmc_hostname(host), err);
+ if (err)
goto out_err;
goto out_err;
- }
err = mmc_switch_status(card);
if (err)
err = mmc_switch_status(card);
if (err)
This page took
0.02774 seconds
and
5
git commands to generate.