Commit 18a09806 authored by Matteo Facchinetti's avatar Matteo Facchinetti Committed by Ulf Hansson

mmc: mxcmmc: fix the default value for available voltages into mxcmci_probe

If available voltages are not given, mmc_regulator_get_supply() function
returns 0 and mxcmmc driver doesn't set a value for ocr_avail mask.

In accordance with the comment in platform_data/mmc-mxcmmc.h,
fix it, assuming MMC_VDD_32_33 | MMC_VDD_33_34 as default value.
Signed-off-by: default avatarMatteo Facchinetti <matteo.facchinetti@sirius-es.it>
Reviewed-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent adfa5703
...@@ -1077,12 +1077,14 @@ static int mxcmci_probe(struct platform_device *pdev) ...@@ -1077,12 +1077,14 @@ static int mxcmci_probe(struct platform_device *pdev)
dat3_card_detect = true; dat3_card_detect = true;
ret = mmc_regulator_get_supply(mmc); ret = mmc_regulator_get_supply(mmc);
if (ret) { if (ret == -EPROBE_DEFER)
if (pdata && ret != -EPROBE_DEFER) goto out_free;
mmc->ocr_avail = pdata->ocr_avail ? :
MMC_VDD_32_33 | MMC_VDD_33_34; if (!mmc->ocr_avail) {
if (pdata && pdata->ocr_avail)
mmc->ocr_avail = pdata->ocr_avail;
else else
goto out_free; mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
} }
if (dat3_card_detect) if (dat3_card_detect)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment