Merge "emmc: fix for mmc_init failure"

This commit is contained in:
Linux Build Service Account 2018-04-09 03:30:22 -07:00 committed by Gerrit - the friendly Code Review server
commit 3c49cc8495

View file

@ -387,8 +387,7 @@ static int mmc_send_op_cond_iter(struct mmc *mmc, int use_arg)
mmc->ocr = cmd.response[0];
/*1ms delay is added to give cards time to respond*/
if(!use_arg)
udelay(1000);
udelay(1000);
return 0;
}
@ -400,7 +399,7 @@ static int mmc_send_op_cond(struct mmc *mmc)
/* Some cards seem to need this */
mmc_go_idle(mmc);
/* Asking to the card its capabilities */
/* Asking to the card its capabilities */
for (i = 0; i < 2; i++) {
err = mmc_send_op_cond_iter(mmc, i != 0);
if (err)