From: "Seunghui Lee" <sh043.lee@samsung.com>
To: "'Adrian Hunter'" <adrian.hunter@intel.com>,
"'Ulf Hansson'" <ulf.hansson@linaro.org>
Cc: "'linux-mmc'" <linux-mmc@vger.kernel.org>,
"'DooHyun Hwang'" <dh0421.hwang@samsung.com>
Subject: RE: [PATCH 1/2] mmc: sd: Fix 1.8V workaround branch
Date: Fri, 19 Aug 2022 09:26:02 +0900 [thread overview]
Message-ID: <029901d8b362$4348c8c0$c9da5a40$@samsung.com> (raw)
In-Reply-To: <20220815073321.63382-2-adrian.hunter@intel.com>
> -----Original Message-----
> From: Adrian Hunter <adrian.hunter@intel.com>
> Sent: Monday, August 15, 2022 4:33 PM
> To: Ulf Hansson <ulf.hansson@linaro.org>
> Cc: linux-mmc <linux-mmc@vger.kernel.org>; Seunghui Lee
> <sh043.lee@samsung.com>; DooHyun Hwang <dh0421.hwang@samsung.com>
> Subject: [PATCH 1/2] mmc: sd: Fix 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. Move the label to the correct place and rename it "cont".
>
> Fixes: 045d705dc1fb ("mmc: core: Enable the MMC host software queue for
> the SD card")
> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
> ---
> drivers/mmc/core/sd.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index
> cee4c0b59f43..bc84d7dfc8e1 100644
> --- a/drivers/mmc/core/sd.c
> +++ b/drivers/mmc/core/sd.c
> @@ -1498,7 +1498,7 @@ static int mmc_sd_init_card(struct mmc_host *host,
> u32 ocr,
> mmc_remove_card(card);
> goto retry;
> }
> - goto done;
> + goto cont;
> }
> }
>
> @@ -1534,7 +1534,7 @@ static int mmc_sd_init_card(struct mmc_host *host,
> u32 ocr,
> mmc_set_bus_width(host, MMC_BUS_WIDTH_4);
> }
> }
> -
> +cont:
> if (!oldcard) {
> /* Read/parse the extension registers. */
> err = sd_read_ext_regs(card);
> @@ -1566,7 +1566,7 @@ static int mmc_sd_init_card(struct mmc_host *host,
> u32 ocr,
> err = -EINVAL;
> goto free_card;
> }
> -done:
> +
> host->card = card;
> return 0;
>
> --
> 2.25.1
Looks good to me.
Reviewed-by: Seunghui Lee <sh043.lee@samsung.com>
next prev parent reply other threads:[~2022-08-19 0:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-15 7:33 [PATCH 0/2] mmc: sd: Fix inconsistent sd3_bus_mode with failed voltage switch Adrian Hunter
2022-08-15 7:33 ` [PATCH 1/2] mmc: sd: Fix 1.8V workaround branch Adrian Hunter
2022-08-19 0:26 ` Seunghui Lee [this message]
2022-08-15 7:33 ` [PATCH 2/2] mmc: sd: Fix inconsistent sd3_bus_mode with failed voltage switch Adrian Hunter
2022-08-16 8:30 ` Seunghui Lee
2022-08-19 14:49 ` [PATCH 0/2] " Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='029901d8b362$4348c8c0$c9da5a40$@samsung.com' \
--to=sh043.lee@samsung.com \
--cc=adrian.hunter@intel.com \
--cc=dh0421.hwang@samsung.com \
--cc=linux-mmc@vger.kernel.org \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox