diff options
| author |   Fabio Estevam <fabio.estevam@freescale.com> | 2015-05-09 09:57:08 -0300 |
|---|---|---|
| committer |   Ulf Hansson <ulf.hansson@linaro.org> | 2015-06-01 09:07:00 +0200 |
| commit | 15064119273735c115fba381823b0746508bae3a (patch) | |
| tree | 6a590361a01ef0a4b08f99e40be190a394dbef68 /drivers/mmc/host | |
| parent | mmc: dt: Allow to specify that no write protect signal is present (diff) | |
| download | linux-dev-15064119273735c115fba381823b0746508bae3a.tar.xz linux-dev-15064119273735c115fba381823b0746508bae3a.zip | |
mmc: sdhci-esdhc-imx: Move mmc_of_parse() to the dt probe
mmc_of_parse() should be placed inside sdhci_esdhc_imx_probe_dt() as it
suits only for the dt case.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host')
| -rw-r--r-- | drivers/mmc/host/sdhci-esdhc-imx.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index 8eed84326e2f..0107eb315b55 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -903,7 +903,8 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev, mmc_of_parse_voltage(np, &host->ocr_mask); - return 0; + /* call to generic mmc_of_parse to support additional capabilities */ + return mmc_of_parse(host->mmc); } #else static inline int @@ -1048,11 +1049,6 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) host->quirks2 |= SDHCI_QUIRK2_NO_1_8_V; } - /* call to generic mmc_of_parse to support additional capabilities */ - err = mmc_of_parse(host->mmc); - if (err) - goto disable_clk; - err = sdhci_add_host(host); if (err) goto disable_clk; |