Merge "platform: msm_shared: Fix MMC tuning in LK for re-tuning."
diff --git a/platform/msm_shared/mmc_sdhci.c b/platform/msm_shared/mmc_sdhci.c
index fd5fbfe..68ce54b 100644
--- a/platform/msm_shared/mmc_sdhci.c
+++ b/platform/msm_shared/mmc_sdhci.c
@@ -773,10 +773,11 @@
uint32_t value = ((drv_type << 4) | MMC_HS200_TIMING);
if (MMC_CARD_MMC(card)) {
- if (card->ext_csd[MMC_EXT_MMC_DRV_STRENGTH] & (1 << drv_type))
+ if (card->ext_csd[MMC_EXT_MMC_DRV_STRENGTH] & (1 << drv_type)){
ret = mmc_switch_cmd(host, card, MMC_ACCESS_WRITE, MMC_EXT_MMC_HS_TIMING, value);
- if (!ret)
- drv_type_changed = true;
+ if (!ret)
+ drv_type_changed = true;
+ }
}
return drv_type_changed;
}
diff --git a/platform/msm_shared/sdhci_msm.c b/platform/msm_shared/sdhci_msm.c
index f295533..b34bfd5 100644
--- a/platform/msm_shared/sdhci_msm.c
+++ b/platform/msm_shared/sdhci_msm.c
@@ -812,11 +812,9 @@
/* Change the driver type & rerun tuning */
while(++drv_type <= MX_DRV_SUPPORTED_HS200)
{
- drv_type_changed = mmc_set_drv_type(host, card, drv_type);
- if (drv_type_changed)
- {
+ if (mmc_set_drv_type(host, card, drv_type))
goto retry_tuning;
- }
+ drv_type_changed = true;
}
}