diff options
| author | Colin Cross <ccross@android.com> | 2011-08-10 18:08:17 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-08-10 18:08:17 -0700 |
| commit | a6667d2dab4fa9b8a91b63dc94195bc723388620 (patch) | |
| tree | e85a369c35917868f46cbebe00691c00f811f185 /drivers/mmc/host | |
| parent | 6584543c5cc44809ba380c2ff1b31d578de78302 (diff) | |
| parent | 9abd59b0df155835a970c2b9c8f93367eb793797 (diff) | |
| download | kernel_samsung_espresso10-a6667d2dab4fa9b8a91b63dc94195bc723388620.zip kernel_samsung_espresso10-a6667d2dab4fa9b8a91b63dc94195bc723388620.tar.gz kernel_samsung_espresso10-a6667d2dab4fa9b8a91b63dc94195bc723388620.tar.bz2 | |
Merge branch 'android-3.0' into android-omap-3.0
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; |