From ea3a988c4ac4fb023c98693eefd2537804abd2f5 Mon Sep 17 00:00:00 2001 From: Jaehoon Chung Date: Mon, 27 Sep 2010 09:42:20 +0100 Subject: [PATCH] --- yaml --- r: 218993 b: refs/heads/master c: 176d1ed426a2a73a87c62a8aa05f6d002353cd50 h: refs/heads/master i: 218991: 1ebc48ce07d081302e617d1525d8dc982f23f7b4 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sdhci.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4df6e97a681d..9070c3cbda16 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 71d7d3d190fe77588269a8febf93cd739bd91eb3 +refs/heads/master: 176d1ed426a2a73a87c62a8aa05f6d002353cd50 diff --git a/trunk/drivers/mmc/host/sdhci.c b/trunk/drivers/mmc/host/sdhci.c index 829e78a21a0d..96c7f6010d0d 100644 --- a/trunk/drivers/mmc/host/sdhci.c +++ b/trunk/drivers/mmc/host/sdhci.c @@ -1849,7 +1849,8 @@ int sdhci_add_host(struct sdhci_host *host) if (caps & SDHCI_CAN_DO_HISPD) mmc->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED; - if (host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) + if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) && + mmc_card_is_removable(mmc)) mmc->caps |= MMC_CAP_NEEDS_POLL; mmc->ocr_avail = 0;