summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/panel/panel-lvds.c
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2019-09-11 12:49:28 +0200
committerSam Ravnborg <sam@ravnborg.org>2019-09-21 20:48:09 +0200
commitfb2ee9bf084bcaeff1e5be100decc0eacb4af2d5 (patch)
tree75dde1f2f7480883d083003d151d29cec9558aab /drivers/gpu/drm/panel/panel-lvds.c
parentdrm: Remove redundant of_device_is_available check (diff)
downloadlinux-fb2ee9bf084bcaeff1e5be100decc0eacb4af2d5.tar.xz
linux-fb2ee9bf084bcaeff1e5be100decc0eacb4af2d5.zip
drm: panel-lvds: Potential Oops in probe error handling
The "lvds->backlight" pointer could be NULL in situations where of_parse_phandle() returns NULL. This code is cleaner if we use the managed devm_of_find_backlight() so the clean up is automatic. Fixes: 7c9dff5bd643 ("drm: panels: Add LVDS panel driver") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Link: https://patchwork.freedesktop.org/patch/msgid/20190911104928.GA15930@mwanda
Diffstat (limited to 'drivers/gpu/drm/panel/panel-lvds.c')
-rw-r--r--drivers/gpu/drm/panel/panel-lvds.c21
1 files changed, 4 insertions, 17 deletions
diff --git a/drivers/gpu/drm/panel/panel-lvds.c b/drivers/gpu/drm/panel/panel-lvds.c
index cab3fb4177e3..2405f26e5d31 100644
--- a/drivers/gpu/drm/panel/panel-lvds.c
+++ b/drivers/gpu/drm/panel/panel-lvds.c
@@ -197,7 +197,6 @@ static int panel_lvds_parse_dt(struct panel_lvds *lvds)
static int panel_lvds_probe(struct platform_device *pdev)
{
struct panel_lvds *lvds;
- struct device_node *np;
int ret;
lvds = devm_kzalloc(&pdev->dev, sizeof(*lvds), GFP_KERNEL);
@@ -243,14 +242,9 @@ static int panel_lvds_probe(struct platform_device *pdev)
return ret;
}
- np = of_parse_phandle(lvds->dev->of_node, "backlight", 0);
- if (np) {
- lvds->backlight = of_find_backlight_by_node(np);
- of_node_put(np);
-
- if (!lvds->backlight)
- return -EPROBE_DEFER;
- }
+ lvds->backlight = devm_of_find_backlight(lvds->dev);
+ if (IS_ERR(lvds->backlight))
+ return PTR_ERR(lvds->backlight);
/*
* TODO: Handle all power supplies specified in the DT node in a generic
@@ -265,14 +259,10 @@ static int panel_lvds_probe(struct platform_device *pdev)
ret = drm_panel_add(&lvds->panel);
if (ret < 0)
- goto error;
+ return ret;
dev_set_drvdata(lvds->dev, lvds);
return 0;
-
-error:
- put_device(&lvds->backlight->dev);
- return ret;
}
static int panel_lvds_remove(struct platform_device *pdev)
@@ -283,9 +273,6 @@ static int panel_lvds_remove(struct platform_device *pdev)
panel_lvds_disable(&lvds->panel);
- if (lvds->backlight)
- put_device(&lvds->backlight->dev);
-
return 0;
}