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

Commit 3cf890fc authored by Doug Anderson's avatar Doug Anderson Committed by Ulf Hansson
Browse files

mmc: dw_mmc: Pass back errors from mmc_of_parse() 



It's possible that mmc_of_parse() could return errors (possibly in
some future version it might return -EPROBE_DEFER even).  Let's pass
those errors back.

Signed-off-by: default avatarDoug Anderson <dianders@chromium.org>
Acked-by: default avatarJaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 1ba4c322

drivers/mmc/host/dw_mmc.c

+6 −4
Original line number Diff line number Diff line
@@ -2259,7 +2259,7 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) 
	/*if there are external regulators, get them*/

	ret = mmc_regulator_get_supply(mmc);

	if (ret == -EPROBE_DEFER)

		goto err_setup_bus;

		goto err_host_allocated;



	if (!mmc->ocr_avail)

		mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
@@ -2283,7 +2283,9 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) 
	if (host->pdata->caps2)

		mmc->caps2 = host->pdata->caps2;



	mmc_of_parse(mmc);

	ret = mmc_of_parse(mmc);

	if (ret)

		goto err_host_allocated;



	if (host->pdata->blk_settings) {

		mmc->max_segs = host->pdata->blk_settings->max_segs;
@@ -2315,7 +2317,7 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) 


	ret = mmc_add_host(mmc);

	if (ret)

		goto err_setup_bus;

		goto err_host_allocated;



#if defined(CONFIG_DEBUG_FS)

	dw_mci_init_debugfs(slot);
@@ -2326,7 +2328,7 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) 


	return 0;



err_setup_bus:

err_host_allocated:

	mmc_free_host(mmc);

	return ret;

}