summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/core
diff options
context:
space:
mode:
authorHaibo Chen <haibo.chen@nxp.com>2017-08-08 18:54:01 +0800
committerUlf Hansson <ulf.hansson@linaro.org>2017-08-08 18:55:43 +0200
commit92ddd95919466de5d34f3cb43635da9a7f9ab814 (patch)
treec2c45c59efa39bd3e4b482fe1869cd6d2dfe3304 /drivers/mmc/core
parentac2b21157a3104ad2daa21c65e6cc73604edba0b (diff)
downloadop-kernel-dev-92ddd95919466de5d34f3cb43635da9a7f9ab814.zip
op-kernel-dev-92ddd95919466de5d34f3cb43635da9a7f9ab814.tar.gz
mmc: mmc: correct the logic for setting HS400ES signal voltage
Change the default err value to -EINVAL, make sure the card only has type EXT_CSD_CARD_TYPE_HS400_1_8V also do the signal voltage setting when select hs400es mode. Fixes: commit 1720d3545b77 ("mmc: core: switch to 1V8 or 1V2 for hs400es mode") Cc: <stable@vger.kernel.org> Signed-off-by: Haibo Chen <haibo.chen@nxp.com> Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/core')
-rw-r--r--drivers/mmc/core/mmc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 4ffea14..2bae69e 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1289,7 +1289,7 @@ out_err:
static int mmc_select_hs400es(struct mmc_card *card)
{
struct mmc_host *host = card->host;
- int err = 0;
+ int err = -EINVAL;
u8 val;
if (!(host->caps & MMC_CAP_8_BIT_DATA)) {
OpenPOWER on IntegriCloud