Hi Maxime,
(CC'ing Mark Brown)
Thank you for the patch.
On Wednesday, 10 January 2018 17:59:41 EET Maxime Ripard wrote:
> 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;
I wouldn't print an error message if ret == -EPROBE_DEFER.
> + } else {
> + lvds->supply = NULL;
> + }
> }
How about
lvds->supply = devm_regulator_get_optional(lvds->dev, "power");
if (IS_ERR(lvds->supply)) {
ret = PTR_ERR(lvds->supply);
if (ret != -ENODEV) {
if (ret == -EPROBE_DEFER)
dev_err(lvds->dev, "failed to request regulator: %d\n", ret);
return ret;
}
lvds->supply = NULL;
}
My preference, however, would be for devm_regulator_get_optional() to return
NULL when no regulator is present. The current implementation returns -ENODEV
in multiple cases, making it impossible to properly discriminate between
having no regulator and not being able to get the regulator due to an error.
Mark, what do you think about this ?
> /* Get GPIOs and backlight controller. */
--
Regards,
Laurent Pinchart
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
