Skip to content

Commit

Permalink
Merge tag 'drm-misc-next-fixes-2019-11-13' of git://anongit.freedeskt…
Browse files Browse the repository at this point in the history
…op.org/drm/drm-misc into drm-next

- Fix memory leak in gpu debugfs node's release (Johan)

Cc: Johan Hovold <johan@kernel.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20191113211056.GA78440@art_vandelay
  • Loading branch information
Dave Airlie committed Nov 13, 2019
2 parents 0990ca2 + a64fc11 commit 3447fd0
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions drivers/gpu/drm/msm/msm_debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,8 @@ static int msm_gpu_release(struct inode *inode, struct file *file)
struct msm_gpu_show_priv *show_priv = m->private;
struct msm_drm_private *priv = show_priv->dev->dev_private;
struct msm_gpu *gpu = priv->gpu;
int ret;

ret = mutex_lock_interruptible(&show_priv->dev->struct_mutex);
if (ret)
return ret;

mutex_lock(&show_priv->dev->struct_mutex);
gpu->funcs->gpu_state_put(show_priv->state);
mutex_unlock(&show_priv->dev->struct_mutex);

Expand Down

0 comments on commit 3447fd0

Please sign in to comment.