From: Ulf Hansson <ulf.hansson@linaro.org>
Date: Tue, 10 Jun 2025 11:16:23 +0000 (+0200)
Subject: mmc: rtsx_usb_sdmmc: Fix error-path in sd_set_power_mode()
X-Git-Tag: v5.4.297~208
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a35952fbe2da22bb5ab0009167f99b1751804b77;p=thirdparty%2Fkernel%2Fstable.git

mmc: rtsx_usb_sdmmc: Fix error-path in sd_set_power_mode()

[ Upstream commit 47a255f7d2eabee06cfbf5b1c2379749442fd01d ]

In the error path of sd_set_power_mode() we don't update host->power_mode,
which could lead to an imbalance of the runtime PM usage count. Fix this by
always updating host->power_mode.

Reviewed-by: Avri Altman <avri.altman@sandisk.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Ricky Wu <ricky_wu@realtek.com>
Link: https://lore.kernel.org/r/20250610111633.504366-2-ulf.hansson@linaro.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/drivers/mmc/host/rtsx_usb_sdmmc.c b/drivers/mmc/host/rtsx_usb_sdmmc.c
index 3261560bede4e..581bec5c4caf8 100644
--- a/drivers/mmc/host/rtsx_usb_sdmmc.c
+++ b/drivers/mmc/host/rtsx_usb_sdmmc.c
@@ -1038,9 +1038,7 @@ static int sd_set_power_mode(struct rtsx_usb_sdmmc *host,
 		err = sd_power_on(host);
 	}
 
-	if (!err)
-		host->power_mode = power_mode;
-
+	host->power_mode = power_mode;
 	return err;
 }