diff options
| author | Kyungmin Park <kyungmin.park@samsung.com> | 2010-08-10 18:01:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-11 08:59:03 -0700 |
| commit | c1f5977c6a136acbf525c634c8511e19d0c1f195 (patch) | |
| tree | 404ef41ded924ff55fae708933c7fb80c2117328 | |
| parent | ae6d6c92212e94b12ab9365c23fb73acc2c3c2e7 (diff) | |
| download | op-kernel-dev-c1f5977c6a136acbf525c634c8511e19d0c1f195.zip op-kernel-dev-c1f5977c6a136acbf525c634c8511e19d0c1f195.tar.gz | |
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>
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index f34ec5d..3896069 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; |
