summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/core
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2023-02-27 22:02:23 +0100
committerUlf Hansson <ulf.hansson@linaro.org>2023-03-23 11:30:19 +0100
commit4b4b7ac73704bfa796d2be6b96cb9072f7298861 (patch)
tree5ed80460a36006917eeb9cb4ff925518944cb2d8 /drivers/mmc/core
parent4453d51e1814a8b7c2e686e50241d7b28088622e (diff)
downloadlinux-stable-4b4b7ac73704bfa796d2be6b96cb9072f7298861.tar.gz
linux-stable-4b4b7ac73704bfa796d2be6b96cb9072f7298861.tar.bz2
linux-stable-4b4b7ac73704bfa796d2be6b96cb9072f7298861.zip
mmc: core: Allow invalid regulator in mmc_regulator_set_ocr()
Basically all host drivers use code like this: if (!IS_ERR(mmc->supply.vmmc)) mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0) Move the IS_ERR() check to mmc_regulator_set_ocr() to simplify host driver code. Suggested-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Link: https://lore.kernel.org/r/0c1e7440-f4bc-b48a-137f-58b75ac98550@gmail.com Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/core')
-rw-r--r--drivers/mmc/core/regulator.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mmc/core/regulator.c b/drivers/mmc/core/regulator.c
index 609201a467ef..4fad81cd5252 100644
--- a/drivers/mmc/core/regulator.c
+++ b/drivers/mmc/core/regulator.c
@@ -110,6 +110,9 @@ int mmc_regulator_set_ocr(struct mmc_host *mmc,
int result = 0;
int min_uV, max_uV;
+ if (IS_ERR(supply))
+ return 0;
+
if (vdd_bit) {
mmc_ocrbitnum_to_vdd(vdd_bit, &min_uV, &max_uV);