Skip to content

Commit 15c5620

Browse files
ahunter6Ulf Hansson
authored andcommitted
mmc: core: Fix UHS-I SD 1.8V workaround branch
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 <adrian.hunter@intel.com> Reviewed-by: Seunghui Lee <sh043.lee@samsung.com> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20220815073321.63382-2-adrian.hunter@intel.com Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
1 parent 1c23f9e commit 15c5620

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

  • drivers/mmc/core

drivers/mmc/core/sd.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,7 +1498,7 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
14981498
mmc_remove_card(card);
14991499
goto retry;
15001500
}
1501-
goto done;
1501+
goto cont;
15021502
}
15031503
}
15041504

@@ -1534,7 +1534,7 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
15341534
mmc_set_bus_width(host, MMC_BUS_WIDTH_4);
15351535
}
15361536
}
1537-
1537+
cont:
15381538
if (!oldcard) {
15391539
/* Read/parse the extension registers. */
15401540
err = sd_read_ext_regs(card);
@@ -1566,7 +1566,7 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
15661566
err = -EINVAL;
15671567
goto free_card;
15681568
}
1569-
done:
1569+
15701570
host->card = card;
15711571
return 0;
15721572

0 commit comments

Comments
 (0)