diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2011-06-21 22:41:49 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-04 21:58:31 -0700 |
| commit | fbbc165db18d24de056e50d8ae7d6f1aa3b198fe (patch) | |
| tree | 11420f8dd91ee0621a2d53f3f5b4f2061efab47c /drivers/mmc/host | |
| parent | 1138473c4a69e0f49d44a0c07fffe90c3dd95824 (diff) | |
| download | kernel_samsung_smdk4412-fbbc165db18d24de056e50d8ae7d6f1aa3b198fe.zip kernel_samsung_smdk4412-fbbc165db18d24de056e50d8ae7d6f1aa3b198fe.tar.gz kernel_samsung_smdk4412-fbbc165db18d24de056e50d8ae7d6f1aa3b198fe.tar.bz2 | |
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 <shawn.guo@linaro.org>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/mmc/host')
| -rw-r--r-- | drivers/mmc/host/sdhci-esdhc-imx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index a19967d..ba31abe 100644 --- 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; |