1 --- a/drivers/mmc/core/sd.c
2 +++ b/drivers/mmc/core/sd.c
3 @@ -264,6 +264,15 @@ static int mmc_switch_hs(struct mmc_card
8 + * Some SDHC cards, notably those with a Sandisk SD controller
9 + * (also found in Kingston products) need a bit of slack
10 + * before successfully handling the SWITCH command. So far,
11 + * cards identifying themselves as "SD04G" and "SD08G" are
16 err = mmc_sd_switch(card, 1, 0, 1, status);
19 --- a/drivers/mmc/core/core.c
20 +++ b/drivers/mmc/core/core.c
21 @@ -302,9 +302,9 @@ void mmc_set_data_timeout(struct mmc_dat
22 * The limit is really 250 ms, but that is
23 * insufficient for some crappy cards.
32 * SDHC cards always use these fixed values.