From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Widawsky Subject: [PATCH] drm/i915: Really fix the debug unregister code Date: Sun, 7 Jul 2013 11:03:53 -0700 Message-ID: <1373220233-20648-1-git-send-email-ben@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from shiva.localdomain (unknown [209.20.75.48]) by gabe.freedesktop.org (Postfix) with ESMTP id 24D23E5DEE for ; Sun, 7 Jul 2013 11:00:42 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org Cc: Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org This smells like a missing git add, but unregister was not handled properly in: commit c032d5491a4d8d56d8364f4919364815b55d3437 Author: Daniel Vetter Date: Thu Jul 4 20:39:49 2013 +0200 drm/i915: convert debugfs creation/destruction to table fops is already the pointer that we want when incrementally removing. One really bad side effect of this failure is all tests in our test suite will fail after module_reload fails. This fix was actually lazily authored by Chris. CC: Chris Wilson Reported-and-tested-by: Ben Widawsky Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_debugfs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index b49d731..d870f27 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -2420,8 +2420,7 @@ void i915_debugfs_cleanup(struct drm_minor *minor) 1, minor); for (i = 0; i < ARRAY_SIZE(i915_debugfs_files); i++) { struct drm_info_list *info_list = - (struct drm_info_list *) &i915_debugfs_files[i].fops; - + (struct drm_info_list *)i915_debugfs_files[i].fops; drm_debugfs_remove_files(info_list, 1, minor); } } -- 1.8.3.2