Commit: fbbc165db18d24de056e50d8ae7d6f1aa3b198fe - linux_3.x_apsh4a0a (git)

linux-3.0.x for AP-SH4A-0A Board

Commit MetaInfo

• Revision: fbbc165db18d24de056e50d8ae7d6f1aa3b198fe (tree)
• Time: 2011-08-05 13:58:31
• Author: Shawn Guo <shawn.guo@lina...>
• Commiter: Greg Kroah-Hartman

Log Message

mmc: sdhci-esdhc-imx: SDHCI_CARD_PRESENT does not get cleared

commit 803862a6f7de4939e0a557214e5e4b37e36f87ff upstream.

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 <[e-mail]>
Acked-by: Wolfram Sang <[e-mail]>
Signed-off-by: Chris Ball <[e-mail]>
Signed-off-by: Greg Kroah-Hartman <[e-mail]>

Change Summary

• modified: drivers/mmc/host/sdhci-esdhc-imx.c

Incremental Difference

--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -74,7 +74,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;