Merge tag 'drm-misc-next-fixes-2019-11-13' of git://anongit.freedesktop.org/drm/drm...

- 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

diff --git a/drivers/gpu/drm/msm/msm_debugfs.c b/drivers/gpu/drm/msm/msm_debugfs.c
index 6be879578140db3c8f7522dd879fef63cc61c833..1c74381a4fc9d3eaacc4ffa6f900160db8f3096d 100644 (file)
--- 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);