From 2ab104621dc97a89bc8f75e3b5903b83e793baf8 Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Sat, 19 Aug 2023 16:43:58 +0300 Subject: [PATCH] HACK: regulator: Don't error on reentrant regulator actions Commit 4fcba5d556b42 ("regulator: implement basic reference counter") implements reference counting for regulator enable/disable actions, but does not update its callers to handle the error cases it adds. This breaks gru-kevin, report enabling the regulator as a success as a workaround. It would be better to fix the callers but that needs more debugging. Signed-off-by: Alper Nebi Yasak --- drivers/power/regulator/regulator_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/power/regulator/regulator_common.c b/drivers/power/regulator/regulator_common.c index e26f5ebec347..1c2dfdf9b19d 100644 --- a/drivers/power/regulator/regulator_common.c +++ b/drivers/power/regulator/regulator_common.c @@ -75,7 +75,7 @@ int regulator_common_set_enable(const struct udevice *dev, /* If previously enabled, increase count */ if (enable && plat->enable_count > 0) { plat->enable_count++; - return -EALREADY; + return 0; } if (!enable) { @@ -85,7 +85,7 @@ int regulator_common_set_enable(const struct udevice *dev, return -EBUSY; } else if (!plat->enable_count) { /* If already disabled, do nothing */ - return -EALREADY; + return 0; } } -- 2.42.0