| commit | ec3a9cbeb806bbf74daee922ff24ffe23d509abe | [log] [tgz] |
|---|---|---|
| author | Neil Armstrong <neil.armstrong@linaro.org> | Wed Oct 09 10:01:56 2024 +0200 |
| committer | Neil Armstrong <neil.armstrong@linaro.org> | Mon Oct 14 09:06:16 2024 +0200 |
| tree | 94049d900e00d4f21170f2029655501dc4730610 | |
| parent | 07eafde67000bf61b2ab010572445ba333b009a3 [diff] |
video: meson: dw-hdmi: do not fail probe if HDMI regulator is already enabled 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>
diff --git a/drivers/video/meson/meson_dw_hdmi.c b/drivers/video/meson/meson_dw_hdmi.c index 587df7b..1631dc3 100644 --- a/drivers/video/meson/meson_dw_hdmi.c +++ b/drivers/video/meson/meson_dw_hdmi.c
@@ -418,8 +418,8 @@ } 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