diff options
| author | Dave Airlie <[email protected]> | 2019-11-14 08:51:02 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2019-11-14 08:51:11 +1000 |
| commit | 3447fd0c9dce7e8f2a9a67ac2bfd8f61aa63da5d (patch) | |
| tree | 3aeff699ce0298018ab97fd75b14d5be85499058 | |
| parent | 0990ca235d9145ec40ed002f8ff7f6e1a910db4f (diff) | |
| parent | a64fc11b9a520c55ca34d82e5ca32274f49b6b15 (diff) | |
Merge tag 'drm-misc-next-fixes-2019-11-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
- Fix memory leak in gpu debugfs node's release (Johan)
Cc: Johan Hovold <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
From: Sean Paul <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/20191113211056.GA78440@art_vandelay
| -rw-r--r-- | drivers/gpu/drm/msm/msm_debugfs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpu/drm/msm/msm_debugfs.c b/drivers/gpu/drm/msm/msm_debugfs.c index 6be879578140..1c74381a4fc9 100644 --- a/drivers/gpu/drm/msm/msm_debugfs.c +++ b/drivers/gpu/drm/msm/msm_debugfs.c @@ -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); |