Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3d95d1d authored by Fabrizio Castro's avatar Fabrizio Castro Committed by Ulf Hansson
Browse files

mmc: tmio: check mmc_regulator_get_supply return value 



mmc_regulator_get_supply returns -EPROBE_DEFER if either vmmc or
vqmmc regulators had their probing deferred.
vqmmc regulator is needed by UHS to work properly, therefore this
patch checks the value returned by mmc_regulator_get_supply to
make sure we have a reference to both vmmc and vqmmc (if found in
the DT).

Signed-off-by: default avatarFabrizio Castro <fabrizio.castro@bp.renesas.com>
Reviewed-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent aaab3c46

drivers/mmc/host/tmio_mmc_core.c

+4 −1
Original line number Diff line number Diff line
@@ -1113,8 +1113,11 @@ static int tmio_mmc_init_ocr(struct tmio_mmc_host *host) 
{

	struct tmio_mmc_data *pdata = host->pdata;

	struct mmc_host *mmc = host->mmc;

	int err;



	mmc_regulator_get_supply(mmc);

	err = mmc_regulator_get_supply(mmc);

	if (err)

		return err;



	/* use ocr_mask if no regulator */

	if (!mmc->ocr_avail)