From 1c238a95a727e8cd3fe1c97a653c4101b8dd39d2 Mon Sep 17 00:00:00 2001 From: Jaehoon Chung Date: Thu, 24 Nov 2016 20:04:40 +0900 Subject: mmc: dw_mmc: check the "present" variable before checking flags Before checking flags, it has to check "present" variable. Otherwise, flags should be cleared everytime. Signed-off-by: Jaehoon Chung Signed-off-by: Ulf Hansson --- drivers/mmc/host/dw_mmc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/mmc') diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 0aa4bcd85bb7..c0e96ade4cc9 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1536,7 +1536,8 @@ static int dw_mci_get_cd(struct mmc_host *mmc) spin_lock_bh(&host->lock); if (present && !test_and_set_bit(DW_MMC_CARD_PRESENT, &slot->flags)) dev_dbg(&mmc->class_dev, "card is present\n"); - else if (!test_and_clear_bit(DW_MMC_CARD_PRESENT, &slot->flags)) + else if (!present && + !test_and_clear_bit(DW_MMC_CARD_PRESENT, &slot->flags)) dev_dbg(&mmc->class_dev, "card is not present\n"); spin_unlock_bh(&host->lock); -- cgit v1.2.3