diff options
author | Rob Clark <robdclark@chromium.org> | 2022-06-28 15:41:29 -0700 |
---|---|---|
committer | Rob Clark <robdclark@chromium.org> | 2022-06-28 15:41:29 -0700 |
commit | 1796c0255bae9d3d4528b8b3916182b2bc4e1e71 (patch) | |
tree | 474ecb1ef87ad1bd1d41c62737da924db224f4a2 /drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | |
parent | Linux 5.19-rc2 (diff) | |
parent | drm/msm/gem: Fix error return on fence id alloc fail (diff) | |
download | linux-dev-1796c0255bae9d3d4528b8b3916182b2bc4e1e71.tar.xz linux-dev-1796c0255bae9d3d4528b8b3916182b2bc4e1e71.zip |
Merge tag 'drm-msm-fixes-2022-06-28' into msm-next-staging
Merge v5.19 fixes to avoid merge conflicts
Signed-off-by: Rob Clark <robdclark@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c')
-rw-r--r-- | drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c index fb48c8c19ec3..17cb1fc78379 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c @@ -216,6 +216,7 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms, encoder = mdp4_lcdc_encoder_init(dev, panel_node); if (IS_ERR(encoder)) { DRM_DEV_ERROR(dev->dev, "failed to construct LCDC encoder\n"); + of_node_put(panel_node); return PTR_ERR(encoder); } @@ -225,6 +226,7 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms, connector = mdp4_lvds_connector_init(dev, panel_node, encoder); if (IS_ERR(connector)) { DRM_DEV_ERROR(dev->dev, "failed to initialize LVDS connector\n"); + of_node_put(panel_node); return PTR_ERR(connector); } |