From: Kyungmin Park <kyungmin.park@samsung.com>
Date: Wed, 11 Aug 2010 01:01:44 +0000 (-0700)
Subject: sdhci: don't assign mmc->caps at SDHCI directly
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c1f5977c6a136acbf525c634c8511e19d0c1f195;p=openwrt%2Fstaging%2Fblogic.git

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 <kyungmin.park@samsung.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index f34ec5d6bccf..3896069bd984 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;