diff options
| author |   Maxime Ripard <maxime.ripard@free-electrons.com> | 2018-01-10 16:59:41 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2018-01-15 10:16:56 +0100 |
| commit | a0d605372a279d71abd29ed985b9a51e66e12170 (patch) | |
| tree | e3e873ce0c06c5fbab93ae13f6383732280bdf4d /drivers/gpu/drm/panel/panel-lvds.c | |
| parent | drm/sun4i: Fix error code in sun4i_tcon_bind() (diff) | |
| download | linux-dev-a0d605372a279d71abd29ed985b9a51e66e12170.tar.xz linux-dev-a0d605372a279d71abd29ed985b9a51e66e12170.zip | |
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.
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Fixes: a1c55bccf600 ("drm/panel: lvds: Add support for the power-supply property")
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180110155941.16109-1-maxime.ripard@free-electrons.com
Diffstat (limited to 'drivers/gpu/drm/panel/panel-lvds.c')
| -rw-r--r-- | drivers/gpu/drm/panel/panel-lvds.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/gpu/drm/panel/panel-lvds.c b/drivers/gpu/drm/panel/panel-lvds.c index 57e38a9e7ab4..b5e3994f0aa8 100644 --- a/drivers/gpu/drm/panel/panel-lvds.c +++ b/drivers/gpu/drm/panel/panel-lvds.c @@ -215,8 +215,15 @@ 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) { + if (ret != -EPROBE_DEFER) + dev_err(lvds->dev, "failed to request regulator: %d\n", + ret); + return ret; + } + + lvds->supply = NULL; } /* Get GPIOs and backlight controller. */ |