[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20180110155941.16109-1-maxime.ripard@free-electrons.com>
Date: Wed, 10 Jan 2018 16:59:41 +0100
From: Maxime Ripard <maxime.ripard@...e-electrons.com>
To: Daniel Vetter <daniel.vetter@...el.com>,
Jani Nikula <jani.nikula@...ux.intel.com>,
Sean Paul <seanpaul@...omium.org>
Cc: dri-devel@...ts.freedesktop.org, linux-kernel@...r.kernel.org,
Laurent Pinchart <laurent.pinchart@...asonboard.com>,
Maxime Ripard <maxime.ripard@...e-electrons.com>
Subject: [PATCH] drm/panel: lvds: Handle the optional regulator case properly
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@...e-electrons.com>
---
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
Powered by blists - more mailing lists