aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJaehoon Chung <jh80.chung@samsung.com>2014-03-02 21:36:48 -0500
committerChris Ball <chris@printf.net>2014-05-12 18:04:35 -0400
commitae0eb348e13774d1119eb84ecbce224647368347 (patch)
treef742544bc003e5f1cfd4144f451883317274a489 /drivers
parent9795a846e10b1a4a5675eb257348b88dfda68193 (diff)
mmc: dw_mmc: restore the card-present checking point
Restore the card-present checking point. (The following part was removed from commit bf626e5 ("mmc: dw_mmc: use slot-gpio to handle cd pin") Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Chris Ball <chris@printf.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/dw_mmc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 6495b733244b..d40991299218 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -2113,6 +2113,11 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
2113#endif /* CONFIG_MMC_DW_IDMAC */ 2113#endif /* CONFIG_MMC_DW_IDMAC */
2114 } 2114 }
2115 2115
2116 if (dw_mci_get_cd(mmc))
2117 set_bit(DW_MMC_CARD_PRESENT, &slot->flags);
2118 else
2119 clear_bit(DW_MMC_CARD_PRESENT, &slot->flags);
2120
2116 ret = mmc_add_host(mmc); 2121 ret = mmc_add_host(mmc);
2117 if (ret) 2122 if (ret)
2118 goto err_setup_bus; 2123 goto err_setup_bus;