Treat vqmmc/vmmc regulator the same way as mmc_regulator_get_supply() in mmc_regulator_set_vqmmc(), since they're optional, do not return an error if not exist. Signed-off-by: Dong Aisheng <aisheng.dong@xxxxxxx> --- drivers/mmc/core/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 99275e4..52bfaf0 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1440,7 +1440,7 @@ int mmc_regulator_set_vqmmc(struct mmc_host *mmc, struct mmc_ios *ios) /* If no vqmmc supply then we can't change the voltage */ if (IS_ERR(mmc->supply.vqmmc)) - return -EINVAL; + return 0; switch (ios->signal_voltage) { case MMC_SIGNAL_VOLTAGE_120: -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html