]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
video: meson: dw-hdmi: do not fail probe if HDMI regulator is already enabled
authorNeil Armstrong <neil.armstrong@linaro.org>
Wed, 9 Oct 2024 08:01:56 +0000 (10:01 +0200)
committerNeil Armstrong <neil.armstrong@linaro.org>
Mon, 14 Oct 2024 07:06:16 +0000 (09:06 +0200)
If the regulator is already enabled, this happens if the regulator
is set in regulator-always-on, regulator_set_enable() return -EALREADY.

Ignore the -EALREADY return since it's not an error.

Suggested-by: Jonas Karlman <jonas@kwiboo.se>
Link: https://lore.kernel.org/r/20241009-u-boot-video-fix-hdmi-supply-already-on-v2-1-4478a28d1f49@linaro.org
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
drivers/video/meson/meson_dw_hdmi.c

index 587df7beb9b0d2c703de7afe1031ae1fce405f07..1631dc38416e803e87b8da487a440667e5b86cbc 100644 (file)
@@ -418,8 +418,8 @@ static int meson_dw_hdmi_probe(struct udevice *dev)
        }
 
        if (!ret) {
-               ret = regulator_set_enable(supply, true);
-               if (ret)
+               ret = regulator_set_enable_if_allowed(supply, true);
+               if (ret && ret != -ENOSYS)
                        return ret;
        }
 #endif