From: Mark Brown Date: Mon, 29 Jul 2013 20:58:01 +0000 (+0100) Subject: mmc: core: Indicate that vmmcq may be absent X-Git-Tag: firefly_0821_release~6165^2~49 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=57670402bd199e28eff4edb50469182c4e2a3b9f;p=firefly-linux-kernel-4.4.55.git mmc: core: Indicate that vmmcq may be absent Use regulator_get_optional() to tell the core that requests for the vmmcq regulator can fail in a real system. Signed-off-by: Mark Brown Acked-by: Chris Ball --- diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index bec3b1a11675..c16f76385e1a 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1321,7 +1321,7 @@ int mmc_regulator_get_supply(struct mmc_host *mmc) supply = devm_regulator_get(dev, "vmmc"); mmc->supply.vmmc = supply; - mmc->supply.vqmmc = devm_regulator_get(dev, "vqmmc"); + mmc->supply.vqmmc = devm_regulator_get_optional(dev, "vqmmc"); if (IS_ERR(supply)) return PTR_ERR(supply);