From 28f874944983b415f6a8f1dd6f03dc89e4c933e5 Mon Sep 17 00:00:00 2001 From: Philip Rakity Date: Wed, 6 Oct 2010 11:57:23 -0700 Subject: [PATCH] --- yaml --- r: 219016 b: refs/heads/master c: 3ab9c8dad6444007700b5949ec80cfdc823d31b4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sdhci.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 345cdd9f6e27..597554c1144d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9ee3eab528d2d21c33584bfb86ed1ebf317cb09 +refs/heads/master: 3ab9c8dad6444007700b5949ec80cfdc823d31b4 diff --git a/trunk/drivers/mmc/host/sdhci.c b/trunk/drivers/mmc/host/sdhci.c index d3f924bcfffd..23358d339a68 100644 --- a/trunk/drivers/mmc/host/sdhci.c +++ b/trunk/drivers/mmc/host/sdhci.c @@ -1194,8 +1194,9 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) else ctrl &= ~SDHCI_CTRL_4BITBUS; - if (ios->timing == MMC_TIMING_SD_HS && - !(host->quirks & SDHCI_QUIRK_NO_HISPD_BIT)) + if ((ios->timing == MMC_TIMING_SD_HS || + ios->timing == MMC_TIMING_MMC_HS) + && !(host->quirks & SDHCI_QUIRK_NO_HISPD_BIT)) ctrl |= SDHCI_CTRL_HISPD; else ctrl &= ~SDHCI_CTRL_HISPD;