Skip to content

Commit 8bca229

Browse files
ahunter6gregkh
authored andcommitted
mmc: core: Fix UHS-I SD 1.8V workaround branch
commit 15c5620 upstream. When introduced, upon success, the 1.8V fixup workaround in mmc_sd_init_card() would branch to practically the end of the function, to a label named "done". Unfortunately, perhaps due to the label name, over time new code has been added that really should have come after "done" not before it. Let's fix the problem by moving the label to the correct place and rename it "cont". Fixes: 045d705 ("mmc: core: Enable the MMC host software queue for the SD card") Signed-off-by: Adrian Hunter <[email protected]> Reviewed-by: Seunghui Lee <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Ulf Hansson <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent fc9b5b3 commit 8bca229

File tree

1 file changed

+3
-3
lines changed
  • drivers/mmc/core

1 file changed

+3
-3
lines changed

drivers/mmc/core/sd.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1491,7 +1491,7 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
14911491
mmc_remove_card(card);
14921492
goto retry;
14931493
}
1494-
goto done;
1494+
goto cont;
14951495
}
14961496
}
14971497

@@ -1527,7 +1527,7 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
15271527
mmc_set_bus_width(host, MMC_BUS_WIDTH_4);
15281528
}
15291529
}
1530-
1530+
cont:
15311531
if (!oldcard) {
15321532
/* Read/parse the extension registers. */
15331533
err = sd_read_ext_regs(card);
@@ -1559,7 +1559,7 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
15591559
err = -EINVAL;
15601560
goto free_card;
15611561
}
1562-
done:
1562+
15631563
host->card = card;
15641564
return 0;
15651565

0 commit comments

Comments
 (0)