diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2016-06-13 19:42:00 -0400 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2016-06-30 06:30:15 -0400 |
| commit | cab103274352721b77fc5923a631fc63350bef8e (patch) | |
| tree | 7096f9c1e96546fd3d2b30461a0c4c8f5e64d4c7 /drivers | |
| parent | 6b9dc6a474fd4e025c615ed4582735360005727c (diff) | |
drm/i915: Fix missing unlock on error in i915_ppgtt_info()
Add the missing unlock before return from function i915_ppgtt_info()
in the error handling case.
Fixes: 1d2ac403ae3b(drm: Protect dev->filelist with its own mutex)
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1465861320-26221-1-git-send-email-weiyj_lk@163.com
(cherry picked from commit b0212486909de4f239ca9f20d032de1b1f2dc52e)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 32690332d441..103546834b60 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c | |||
| @@ -2365,16 +2365,16 @@ static int i915_ppgtt_info(struct seq_file *m, void *data) | |||
| 2365 | task = get_pid_task(file->pid, PIDTYPE_PID); | 2365 | task = get_pid_task(file->pid, PIDTYPE_PID); |
| 2366 | if (!task) { | 2366 | if (!task) { |
| 2367 | ret = -ESRCH; | 2367 | ret = -ESRCH; |
| 2368 | goto out_put; | 2368 | goto out_unlock; |
| 2369 | } | 2369 | } |
| 2370 | seq_printf(m, "\nproc: %s\n", task->comm); | 2370 | seq_printf(m, "\nproc: %s\n", task->comm); |
| 2371 | put_task_struct(task); | 2371 | put_task_struct(task); |
| 2372 | idr_for_each(&file_priv->context_idr, per_file_ctx, | 2372 | idr_for_each(&file_priv->context_idr, per_file_ctx, |
| 2373 | (void *)(unsigned long)m); | 2373 | (void *)(unsigned long)m); |
| 2374 | } | 2374 | } |
| 2375 | out_unlock: | ||
| 2375 | mutex_unlock(&dev->filelist_mutex); | 2376 | mutex_unlock(&dev->filelist_mutex); |
| 2376 | 2377 | ||
| 2377 | out_put: | ||
| 2378 | intel_runtime_pm_put(dev_priv); | 2378 | intel_runtime_pm_put(dev_priv); |
| 2379 | mutex_unlock(&dev->struct_mutex); | 2379 | mutex_unlock(&dev->struct_mutex); |
| 2380 | 2380 | ||
