diff options
| author | Colin Cross <ccross@android.com> | 2011-08-10 18:08:07 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-08-10 18:08:07 -0700 |
| commit | 6ba1c700230f1e9cadd5abb15edba8573c0de40e (patch) | |
| tree | 9a51a553382574b59d343c837934683764a2e241 /drivers/mmc | |
| parent | d2c3c40789e6645e40c8538182acf7a6831d1db3 (diff) | |
| parent | 94ed5b4788a7cdbe68bc7cb8516972cbebdc8274 (diff) | |
| download | kernel_samsung_tuna-6ba1c700230f1e9cadd5abb15edba8573c0de40e.zip kernel_samsung_tuna-6ba1c700230f1e9cadd5abb15edba8573c0de40e.tar.gz kernel_samsung_tuna-6ba1c700230f1e9cadd5abb15edba8573c0de40e.tar.bz2 | |
Merge commit 'v3.0.1' into linux-omap-3.0
Diffstat (limited to 'drivers/mmc')
| -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; |