On Thu, 21 Aug 2025 at 14:32, Dan Carpenter <dan.carpenter@xxxxxxxxxx> wrote:
>
> If rtsx_usb_get_card_status() fails then "val" isn't initialized.
> Move the use of "val" until after the error checking.
>
> Fixes: d2e6fb2c31a0 ("misc: rtsx: usb card reader: add OCP support")
> Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Applied for next, thanks!
Kind regards
Uffe
> ---
> drivers/mmc/host/rtsx_usb_sdmmc.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/host/rtsx_usb_sdmmc.c b/drivers/mmc/host/rtsx_usb_sdmmc.c
> index e1ed39c657c3..70bd21084b97 100644
> --- a/drivers/mmc/host/rtsx_usb_sdmmc.c
> +++ b/drivers/mmc/host/rtsx_usb_sdmmc.c
> @@ -785,13 +785,13 @@ static int sdmmc_get_cd(struct mmc_host *mmc)
>
> mutex_unlock(&ucr->dev_mutex);
>
> - /* get OCP status */
> - host->ocp_stat = (val >> 4) & 0x03;
> -
> /* Treat failed detection as non-exist */
> if (err)
> goto no_card;
>
> + /* get OCP status */
> + host->ocp_stat = (val >> 4) & 0x03;
> +
> if (val & SD_CD) {
> host->card_exist = true;
> return 1;
> --
> 2.47.2
>
