summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorJaehoon Chung <jh80.chung@samsung.com>2014-03-03 11:36:48 +0900
committerChris Ball <chris@printf.net>2014-05-12 18:04:35 -0400
commitae0eb348e13774d1119eb84ecbce224647368347 (patch)
treef742544bc003e5f1cfd4144f451883317274a489 /drivers/mmc
parent9795a846e10b1a4a5675eb257348b88dfda68193 (diff)
downloadop-kernel-dev-ae0eb348e13774d1119eb84ecbce224647368347.zip
op-kernel-dev-ae0eb348e13774d1119eb84ecbce224647368347.tar.gz
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/mmc')
-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 6495b73..d409912 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)
#endif /* CONFIG_MMC_DW_IDMAC */
}
+ if (dw_mci_get_cd(mmc))
+ set_bit(DW_MMC_CARD_PRESENT, &slot->flags);
+ else
+ clear_bit(DW_MMC_CARD_PRESENT, &slot->flags);
+
ret = mmc_add_host(mmc);
if (ret)
goto err_setup_bus;
OpenPOWER on IntegriCloud