summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-05-21 19:56:52 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-05-22 09:22:36 +0200
commit6bd459df96ffc2488e7816c78e78bcc706c58276 (patch)
treee6427631f1102597b1aa86298ad4037ac81faa3e /drivers/gpu
parent65e818660275ecda3702a4245f308923e3813a85 (diff)
downloadlinux-6bd459df96ffc2488e7816c78e78bcc706c58276.tar.gz
linux-6bd459df96ffc2488e7816c78e78bcc706c58276.tar.xz
linux-6bd459df96ffc2488e7816c78e78bcc706c58276.zip
drm/i915: fix module unload since error_state rework
We need to remove the debugfs file. Regression introduce in commit d54423037f141518950f324af88a551a82449496 Author: Daniel Vetter <daniel.vetter@ffwll.ch> Date: Fri Apr 27 15:17:40 2012 +0200 drm/i915: allow the existing error_state to be destroyed Reported-and-Tested-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/i915_debugfs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index eb2b3c25b9e1..5363e9c66c27 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2032,6 +2032,8 @@ void i915_debugfs_cleanup(struct drm_minor *minor)
1, minor);
drm_debugfs_remove_files((struct drm_info_list *) &i915_ring_stop_fops,
1, minor);
+ drm_debugfs_remove_files((struct drm_info_list *) &i915_error_state_fops,
+ 1, minor);
}
#endif /* CONFIG_DEBUG_FS */