[4.14,28/75] mmc: tmio: check mmc_regulator_get_supply return value
diff mbox series

Message ID 20171207130819.904540714@linuxfoundation.org
State New, archived
Headers show
  • 4.14.5-stable review
Related show

Commit Message

Greg Kroah-Hartman Dec. 7, 2017, 1:07 p.m. UTC
4.14-stable review patch.  If anyone has any objections, please let me know.


From: Fabrizio Castro <fabrizio.castro@bp.renesas.com>

[ Upstream commit a3d95d1d4007b1fefd6d8b12db26fda05de05cfb ]

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: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 drivers/mmc/host/tmio_mmc_core.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff mbox series

--- a/drivers/mmc/host/tmio_mmc_core.c
+++ b/drivers/mmc/host/tmio_mmc_core.c
@@ -1113,8 +1113,11 @@  static int tmio_mmc_init_ocr(struct tmio
 	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)