| 1 | --- a/drivers/mmc/core/core.c |
| 2 | +++ b/drivers/mmc/core/core.c |
| 3 | @@ -922,7 +922,7 @@ static void mmc_power_up(struct mmc_host |
| 4 | * This delay should be sufficient to allow the power supply |
| 5 | * to reach the minimum voltage. |
| 6 | */ |
| 7 | - mmc_delay(10); |
| 8 | + mmc_delay(200); |
| 9 | |
| 10 | host->ios.clock = host->f_init; |
| 11 | |
| 12 | @@ -933,7 +933,7 @@ static void mmc_power_up(struct mmc_host |
| 13 | * This delay must be at least 74 clock sizes, or 1 ms, or the |
| 14 | * time required to reach a stable voltage. |
| 15 | */ |
| 16 | - mmc_delay(10); |
| 17 | + mmc_delay(200); |
| 18 | } |
| 19 | |
| 20 | static void mmc_power_off(struct mmc_host *host) |
| 21 | --- a/drivers/mmc/core/sdio_cis.c |
| 22 | +++ b/drivers/mmc/core/sdio_cis.c |
| 23 | @@ -156,7 +156,8 @@ static int cistpl_funce_common(struct mm |
| 24 | /* TPLFE_MAX_TRAN_SPEED */ |
| 25 | card->cis.max_dtr = speed_val[(buf[3] >> 3) & 15] * |
| 26 | speed_unit[buf[3] & 7]; |
| 27 | - |
| 28 | + if(card->cis.max_dtr > 25000000 && card->cccr.sdio_vsn < SDIO_SDIO_REV_2_00) |
| 29 | + card->cis.max_dtr = 25000000; |
| 30 | return 0; |
| 31 | } |
| 32 | |
| 33 | @@ -177,14 +178,14 @@ static int cistpl_funce_func(struct mmc_ |
| 34 | vsn = func->card->cccr.sdio_vsn; |
| 35 | min_size = (vsn == SDIO_SDIO_REV_1_00) ? 28 : 42; |
| 36 | |
| 37 | - if (size < min_size) |
| 38 | + if (buf[0] != 1) |
| 39 | return -EINVAL; |
| 40 | |
| 41 | /* TPLFE_MAX_BLK_SIZE */ |
| 42 | func->max_blksize = buf[12] | (buf[13] << 8); |
| 43 | |
| 44 | /* TPLFE_ENABLE_TIMEOUT_VAL, present in ver 1.1 and above */ |
| 45 | - if (vsn > SDIO_SDIO_REV_1_00) |
| 46 | + if (vsn > SDIO_SDIO_REV_1_00 && size >= min_size) |
| 47 | func->enable_timeout = (buf[28] | (buf[29] << 8)) * 10; |
| 48 | else |
| 49 | func->enable_timeout = jiffies_to_msecs(HZ); |
| 50 | |
