From c1f5977c6a136acbf525c634c8511e19d0c1f195 Mon Sep 17 00:00:00 2001 From: Kyungmin Park Date: Tue, 10 Aug 2010 18:01:44 -0700 Subject: sdhci: don't assign mmc->caps at SDHCI directly Some host controllers can set mmc->caps before sdhci_add_host(). Signed-off-by: Kyungmin Park Cc: Grant Likely Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/mmc/host/sdhci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/mmc') diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index f34ec5d6bcc..3896069bd98 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1797,7 +1797,7 @@ int sdhci_add_host(struct sdhci_host *host) else mmc->f_min = host->max_clk / 256; mmc->f_max = host->max_clk; - mmc->caps = MMC_CAP_SDIO_IRQ; + mmc->caps |= MMC_CAP_SDIO_IRQ; if (!(host->quirks & SDHCI_QUIRK_FORCE_1_BIT_DATA)) mmc->caps |= MMC_CAP_4_BIT_DATA; -- cgit v1.2.3-70-g09d2