sdhci: don't assign mmc->caps at SDHCI directly

PATCH In review [email protected] 1 participant 1 message Aug 11, 2010

Subsystems (2)

MMC, SD and SDIO Secure digital host controller interface (SDHCI) driver

lore

Share & tools

lore

[email protected]

author

2010-08-11 01:17 UTC #0 lore raw

PATCH 38/177 sdhci: don't assign mmc->caps at SDHCI directly

From: Kyungmin Park <[email protected]>

Some host controllers can set mmc->caps before sdhci_add_host().

Signed-off-by Kyungmin Park <[email protected]>

Cc Grant Likely <[email protected]>

Cc <[email protected]>

Signed-off-by Andrew Morton <[email protected]>

---

 drivers/mmc/host/sdhci.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/mmc/host/sdhci.c renamed from drivers/mmc/host/sdhci.c~sdhci-dont-assign-mmc-caps-at-sdhci-directly +1 -1

diff -puN drivers/mmc/host/sdhci.c~sdhci-dont-assign-mmc-caps-at-sdhci-directly drivers/mmc/host/sdhci.c
@@ -1797,7 +1797,7 @@ int sdhci_add_host(struct sdhci_host *ho
 	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;