]> Pileus Git - ~andy/linux/commitdiff
drm/i915: fix module unload since error_state rework
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 21 May 2012 17:56:52 +0000 (19:56 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 22 May 2012 07:22:36 +0000 (09:22 +0200)
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>
drivers/gpu/drm/i915/i915_debugfs.c

index eb2b3c25b9e12b19c2113444d5d2f8e175756ba6..5363e9c66c27e4fe1a4be0fecf26dd4263920be6 100644 (file)
@@ -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 */