|
@@ -2498,15 +2498,18 @@ static int mmc_rescan_try_freq(struct mmc_host *host, unsigned freq)
|
|
|
|
|
|
|
|
mmc_go_idle(host);
|
|
mmc_go_idle(host);
|
|
|
|
|
|
|
|
- mmc_send_if_cond(host, host->ocr_avail);
|
|
|
|
|
|
|
+ if (!(host->caps2 & MMC_CAP2_NO_SD))
|
|
|
|
|
+ mmc_send_if_cond(host, host->ocr_avail);
|
|
|
|
|
|
|
|
/* Order's important: probe SDIO, then SD, then MMC */
|
|
/* Order's important: probe SDIO, then SD, then MMC */
|
|
|
if (!(host->caps2 & MMC_CAP2_NO_SDIO))
|
|
if (!(host->caps2 & MMC_CAP2_NO_SDIO))
|
|
|
if (!mmc_attach_sdio(host))
|
|
if (!mmc_attach_sdio(host))
|
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
|
|
- if (!mmc_attach_sd(host))
|
|
|
|
|
- return 0;
|
|
|
|
|
|
|
+ if (!(host->caps2 & MMC_CAP2_NO_SD))
|
|
|
|
|
+ if (!mmc_attach_sd(host))
|
|
|
|
|
+ return 0;
|
|
|
|
|
+
|
|
|
if (!mmc_attach_mmc(host))
|
|
if (!mmc_attach_mmc(host))
|
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|