drm/panel: lvds: Handle the optional regulator case properly
authorMaxime Ripard <maxime.ripard@free-electrons.com>
Wed, 10 Jan 2018 15:59:41 +0000 (16:59 +0100)
committerMaxime Ripard <maxime.ripard@free-electrons.com>
Mon, 15 Jan 2018 09:16:56 +0000 (10:16 +0100)
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
drivers/gpu/drm/panel/panel-lvds.c

index 57e38a9e7ab4f2c19820d3225b8a5077d226fe8c..b5e3994f0aa8c69929d3f88cb7a3be5acc272a93 100644 (file)
@@ -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. */