diff options
| author | Rob Clark <robdclark@gmail.com> | 2013-12-13 10:38:54 -0500 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2014-02-05 11:15:30 -0500 |
| commit | 37033a7689b01d0c46f9cc450bdf9f02d86b7e57 (patch) | |
| tree | a7e52c8de58e253b3edbb8e8cd608fab205424ff | |
| parent | 7896052d90d7de899fd3a34c0b34e91941e2f2ea (diff) | |
| download | linux-stable-37033a7689b01d0c46f9cc450bdf9f02d86b7e57.tar.gz linux-stable-37033a7689b01d0c46f9cc450bdf9f02d86b7e57.tar.bz2 linux-stable-37033a7689b01d0c46f9cc450bdf9f02d86b7e57.zip | |
drm/msm/mdp5: fix ref leaks in error paths
Signed-off-by: Rob Clark <robdclark@gmail.com>
| -rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c index 71a3b2345eb3..f2794021f086 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c @@ -296,6 +296,7 @@ static int mdp5_crtc_mode_set(struct drm_crtc *crtc, x << 16, y << 16, mode->hdisplay << 16, mode->vdisplay << 16); if (ret) { + drm_framebuffer_unreference(crtc->fb); dev_err(crtc->dev->dev, "%s: failed to set mode on plane: %d\n", mdp5_crtc->name, ret); return ret; @@ -343,11 +344,15 @@ static int mdp5_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, 0, 0, mode->hdisplay, mode->vdisplay, x << 16, y << 16, mode->hdisplay << 16, mode->vdisplay << 16); + if (ret) { + drm_framebuffer_unreference(crtc->fb); + return ret; + } update_fb(crtc, crtc->fb); update_scanout(crtc, crtc->fb); - return ret; + return 0; } static void mdp5_crtc_load_lut(struct drm_crtc *crtc) |