[PATCH] drm/panel: lvds: Handle the optional regulator case properly

From: Maxime Ripard
Date: Wed Jan 10 2018 - 11:07:03 EST


The devm_regulator_get_optional function, unlike it was assumed in the
commit a1c55bccf600 ("drm/panel: lvds: Add support for the power-supply
property"), is actually returning an error pointer with -ENODEV instead of
NULL when there's no regulator to find.

Make sure we handle that case properly.

Fixes: a1c55bccf600 ("drm/panel: lvds: Add support for the power-supply property")
Signed-off-by: Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/panel/panel-lvds.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/panel/panel-lvds.c b/drivers/gpu/drm/panel/panel-lvds.c
index 57e38a9e7ab4..9f46e7095c0e 100644
--- a/drivers/gpu/drm/panel/panel-lvds.c
+++ b/drivers/gpu/drm/panel/panel-lvds.c
@@ -215,8 +215,13 @@ static int panel_lvds_probe(struct platform_device *pdev)
lvds->supply = devm_regulator_get_optional(lvds->dev, "power");
if (IS_ERR(lvds->supply)) {
ret = PTR_ERR(lvds->supply);
- dev_err(lvds->dev, "failed to request regulator: %d\n", ret);
- return ret;
+
+ if (ret != -ENODEV) {
+ dev_err(lvds->dev, "failed to request regulator: %d\n", ret);
+ return ret;
+ } else {
+ lvds->supply = NULL;
+ }
}

/* Get GPIOs and backlight controller. */
--
2.14.3