Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[mirror_ubuntu-hirsute-kernel.git] / drivers / mmc / core / sdio_cis.c

diff --git a/drivers/mmc/core/sdio_cis.c b/drivers/mmc/core/sdio_cis.c
index 6f6fc527a263384817316afe478803634429633a..dcb3dee59fa5f2eaa7d273f24b31c9a346567809 100644 (file)
--- a/drivers/mmc/core/sdio_cis.c
+++ b/drivers/mmc/core/sdio_cis.c
@@ -177,8 +177,13 @@ static int cistpl_funce_func(struct mmc_card *card, struct sdio_func *func,
        vsn = func->card->cccr.sdio_vsn;
        min_size = (vsn == SDIO_SDIO_REV_1_00) ? 28 : 42;
 
-       if (size < min_size)
+       if (size == 28 && vsn == SDIO_SDIO_REV_1_10) {
+               pr_warn("%s: card has broken SDIO 1.1 CIS, forcing SDIO 1.0\n",
+                       mmc_hostname(card->host));
+               vsn = SDIO_SDIO_REV_1_00;
+       } else if (size < min_size) {
                return -EINVAL;
+       }
 
        /* TPLFE_MAX_BLK_SIZE */
        func->max_blksize = buf[12] | (buf[13] << 8);