Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-15 13:15:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/panel: lvds: Handle the optional regulator case properly

Browse Source 
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
This commit is contained in:
Maxime Ripard 2018-01-10 16:59:41 +01:00
parent 86a3ae5879
commit a0d605372a
No known key found for this signature in database
GPG Key ID: D2B4C094214DAF74
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpu/drm/panel/panel-lvds.c
View File

@ -215,8 +215,15 @@ static int panel_lvds_probe(struct platform_device *pdev)
lvds->supply = devm_regulator_get_optional(lvds->dev, "power"); lvds->supply = devm_regulator_get_optional(lvds->dev, "power");
if (IS_ERR(lvds->supply)) { if (IS_ERR(lvds->supply)) {
ret = PTR_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. */ /* Get GPIOs and backlight controller. */