From: Shawn Guo Date: Tue, 21 Jun 2011 14:41:49 +0000 (+0800) Subject: mmc: sdhci-esdhc-imx: SDHCI_CARD_PRESENT does not get cleared X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=803862a6f7de4939e0a557214e5e4b37e36f87ff;p=deliverable%2Flinux.git mmc: sdhci-esdhc-imx: SDHCI_CARD_PRESENT does not get cleared The function esdhc_readl_le intends to clear bit SDHCI_CARD_PRESENT, when the card detect gpio tells there is no card. But it does not clear the bit actually. The patch gives a fix on that. Signed-off-by: Shawn Guo Acked-by: Wolfram Sang Cc: Signed-off-by: Chris Ball --- diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index 7cfb768126cc..01d42601e8dc 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -72,7 +72,7 @@ static u32 esdhc_readl_le(struct sdhci_host *host, int reg) if (boarddata && gpio_is_valid(boarddata->cd_gpio) && gpio_get_value(boarddata->cd_gpio)) /* no card, if a valid gpio says so... */ - val &= SDHCI_CARD_PRESENT; + val &= ~SDHCI_CARD_PRESENT; else /* ... in all other cases assume card is present */ val |= SDHCI_CARD_PRESENT;