aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKyungmin Park <kyungmin.park@samsung.com>2010-08-10 21:01:44 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-11 11:59:03 -0400
commitc1f5977c6a136acbf525c634c8511e19d0c1f195 (patch)
tree404ef41ded924ff55fae708933c7fb80c2117328 /drivers
parentae6d6c92212e94b12ab9365c23fb73acc2c3c2e7 (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/sdhci.c2
1 files changed, 1 insertions, 1 deletions
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)
1797 else 1797 else
1798 mmc->f_min = host->max_clk / 256; 1798 mmc->f_min = host->max_clk / 256;
1799 mmc->f_max = host->max_clk; 1799 mmc->f_max = host->max_clk;
1800 mmc->caps = MMC_CAP_SDIO_IRQ; 1800 mmc->caps |= MMC_CAP_SDIO_IRQ;
1801 1801
1802 if (!(host->quirks & SDHCI_QUIRK_FORCE_1_BIT_DATA)) 1802 if (!(host->quirks & SDHCI_QUIRK_FORCE_1_BIT_DATA))
1803 mmc->caps |= MMC_CAP_4_BIT_DATA; 1803 mmc->caps |= MMC_CAP_4_BIT_DATA;