drm/i915: unlock on error in i915_ppgtt_info()
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 2 Oct 2015 15:14:22 +0000 (18:14 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 5 Oct 2015 08:01:02 +0000 (10:01 +0200)
We need to call intel_runtime_pm_put() and mutex_unlock() before
returning.

Fixes: 7cb5dff8d59d ('drm/i915: fix task reference leak in i915_debugfs.c')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Geliang Tang <geliangtang@163.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_debugfs.c

index 77ee8c5062b9a43fe34e4f0fac3a95cadf359a65..7e65015ecbee104383c531226be3f9a7ce7e9bd9 100644 (file)
@@ -2298,18 +2298,21 @@ static int i915_ppgtt_info(struct seq_file *m, void *data)
                struct task_struct *task;
 
                task = get_pid_task(file->pid, PIDTYPE_PID);
-               if (!task)
-                       return -ESRCH;
+               if (!task) {
+                       ret = -ESRCH;
+                       goto out_put;
+               }
                seq_printf(m, "\nproc: %s\n", task->comm);
                put_task_struct(task);
                idr_for_each(&file_priv->context_idr, per_file_ctx,
                             (void *)(unsigned long)m);
        }
 
+out_put:
        intel_runtime_pm_put(dev_priv);
        mutex_unlock(&dev->struct_mutex);
 
-       return 0;
+       return ret;
 }
 
 static int count_irq_waiters(struct drm_i915_private *i915)