The patch titled sdhci: don't assign mmc->caps at SDHCI directly has been added to the -mm tree. Its filename is sdhci-dont-assign-mmc-caps-at-sdhci-directly.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: sdhci: don't assign mmc->caps at SDHCI directly From: Kyungmin Park <kyungmin.park@xxxxxxxxxxx> Some host controllers can set mmc->caps before sdhci_add_host(). Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx> Cc: Grant Likely <grant.likely@xxxxxxxxxxxx> Cc: <linux-mmc@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/mmc/host/sdhci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/mmc/host/sdhci.c~sdhci-dont-assign-mmc-caps-at-sdhci-directly drivers/mmc/host/sdhci.c --- a/drivers/mmc/host/sdhci.c~sdhci-dont-assign-mmc-caps-at-sdhci-directly +++ a/drivers/mmc/host/sdhci.c @@ -1798,7 +1798,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; _ Patches currently in -mm which might be from kyungmin.park@xxxxxxxxxxx are linux-next.patch mmc-recognize-csd-structure.patch mmc-recognize-csd-structure-fix.patch s5pc110-sdhci-s3c-can-override-host-capabilities.patch s5pc110-sdhci-s3c-support-on-s5pc110.patch sdhci-add-no-hi-speed-bit-quirk-support.patch sdhci-remove-useless-set_clock-check.patch sdhci-8-bit-data-transfer-width-support.patch sdhci-dont-assign-mmc-caps-at-sdhci-directly.patch -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html