diff options
-rw-r--r-- | drivers/mmc/host/sdhci-esdhc-imx.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index faf0cb910c96..48153917ed08 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c | |||
@@ -881,6 +881,7 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev, | |||
881 | struct esdhc_platform_data *boarddata) | 881 | struct esdhc_platform_data *boarddata) |
882 | { | 882 | { |
883 | struct device_node *np = pdev->dev.of_node; | 883 | struct device_node *np = pdev->dev.of_node; |
884 | int ret; | ||
884 | 885 | ||
885 | if (!np) | 886 | if (!np) |
886 | return -ENODEV; | 887 | return -ENODEV; |
@@ -917,7 +918,14 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev, | |||
917 | mmc_of_parse_voltage(np, &host->ocr_mask); | 918 | mmc_of_parse_voltage(np, &host->ocr_mask); |
918 | 919 | ||
919 | /* call to generic mmc_of_parse to support additional capabilities */ | 920 | /* call to generic mmc_of_parse to support additional capabilities */ |
920 | return mmc_of_parse(host->mmc); | 921 | ret = mmc_of_parse(host->mmc); |
922 | if (ret) | ||
923 | return ret; | ||
924 | |||
925 | if (!IS_ERR_VALUE(mmc_gpio_get_cd(host->mmc))) | ||
926 | host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION; | ||
927 | |||
928 | return 0; | ||
921 | } | 929 | } |
922 | #else | 930 | #else |
923 | static inline int | 931 | static inline int |