2009-06-01 15:50:35 +03:00
|
|
|
--- a/drivers/mmc/core/sd.c
|
|
|
|
|
+++ b/drivers/mmc/core/sd.c
|
2011-03-18 15:09:21 +02:00
|
|
|
@@ -332,6 +332,15 @@ int mmc_sd_switch_hs(struct mmc_card *ca
|
2009-06-01 15:50:35 +03:00
|
|
|
return -ENOMEM;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+ /*
|
|
|
|
|
+ * Some SDHC cards, notably those with a Sandisk SD controller
|
|
|
|
|
+ * (also found in Kingston products) need a bit of slack
|
|
|
|
|
+ * before successfully handling the SWITCH command. So far,
|
|
|
|
|
+ * cards identifying themselves as "SD04G" and "SD08G" are
|
|
|
|
|
+ * affected
|
|
|
|
|
+ */
|
|
|
|
|
+ udelay(1000);
|
|
|
|
|
+
|
|
|
|
|
err = mmc_sd_switch(card, 1, 0, 1, status);
|
|
|
|
|
if (err)
|
|
|
|
|
goto out;
|
|
|
|
|
--- a/drivers/mmc/core/core.c
|
|
|
|
|
+++ b/drivers/mmc/core/core.c
|
2011-03-18 15:09:21 +02:00
|
|
|
@@ -303,9 +303,9 @@ void mmc_set_data_timeout(struct mmc_dat
|
2009-06-01 15:50:35 +03:00
|
|
|
* The limit is really 250 ms, but that is
|
|
|
|
|
* insufficient for some crappy cards.
|
|
|
|
|
*/
|
|
|
|
|
- limit_us = 300000;
|
|
|
|
|
+ limit_us = 500000;
|
|
|
|
|
else
|
|
|
|
|
- limit_us = 100000;
|
|
|
|
|
+ limit_us = 200000;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* SDHC cards always use these fixed values.
|
