diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2011-06-21 10:41:49 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2011-07-20 17:21:02 -0400 |
commit | 803862a6f7de4939e0a557214e5e4b37e36f87ff (patch) | |
tree | dc004c32b20a55e6e2a79fcdbc1348f04ff29c4d /drivers/mmc/host/sdhci-esdhc-imx.c | |
parent | d25928d1eed06a9c23c723466dfa7cbee0a5e07d (diff) |
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 <shawn.guo@linaro.org>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: <stable@kernel.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host/sdhci-esdhc-imx.c')
-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 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) | |||
72 | if (boarddata && gpio_is_valid(boarddata->cd_gpio) | 72 | if (boarddata && gpio_is_valid(boarddata->cd_gpio) |
73 | && gpio_get_value(boarddata->cd_gpio)) | 73 | && gpio_get_value(boarddata->cd_gpio)) |
74 | /* no card, if a valid gpio says so... */ | 74 | /* no card, if a valid gpio says so... */ |
75 | val &= SDHCI_CARD_PRESENT; | 75 | val &= ~SDHCI_CARD_PRESENT; |
76 | else | 76 | else |
77 | /* ... in all other cases assume card is present */ | 77 | /* ... in all other cases assume card is present */ |
78 | val |= SDHCI_CARD_PRESENT; | 78 | val |= SDHCI_CARD_PRESENT; |