Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1189830

[PATCH] drm/i915: add error path

Show all headers | View raw

If any of the debug file creation fails we were just returning the
error code to the drm layer. But the debug files that we created in the
process were not removed. And debugfs files are not automatically
cleaned up.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---

Hi Daniel,
Whom should i keep Cc: for this patch? Original code was from 2009, then
more codes have been added and changed in it.

 drivers/gpu/drm/i915/i915_debugfs.c | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index caf1382..24b04f9 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -5147,7 +5147,7 @@ int i915_debugfs_init(struct drm_minor *minor)
 	for (i = 0; i < ARRAY_SIZE(i915_pipe_crc_data); i++) {
 		ret = i915_pipe_crc_create(minor->debugfs_root, minor, i);
 		if (ret)
-			return ret;
+			goto err_pipe_crc;
 	}
 
 	for (i = 0; i < ARRAY_SIZE(i915_debugfs_files); i++) {
@@ -5155,12 +5155,34 @@ int i915_debugfs_init(struct drm_minor *minor)
 					  i915_debugfs_files[i].name,
 					  i915_debugfs_files[i].fops);
 		if (ret)
-			return ret;
+			goto err_debugfs;
 	}
 
 	return drm_debugfs_create_files(i915_debugfs_list,
 					I915_DEBUGFS_ENTRIES,
 					minor->debugfs_root, minor);
+
+err_debugfs:
+	while (--i >= 0) {
+		struct drm_info_list *info_list =
+			(struct drm_info_list *)i915_debugfs_files[i].fops;
+
+		drm_debugfs_remove_files(info_list, 1, minor);
+	}
+
+err_pipe_crc:
+	if (i == -1)
+		i = ARRAY_SIZE(i915_pipe_crc_data);
+
+	while (--i >= 0) {
+		struct drm_info_list *info_list =
+			(struct drm_info_list *)&i915_pipe_crc_data[i];
+		drm_debugfs_remove_files(info_list, 1, minor);
+	}
+	drm_debugfs_remove_files((struct drm_info_list *)&i915_forcewake_fops,
+				 1, minor);
+
+	return ret;
 }
 
 void i915_debugfs_cleanup(struct drm_minor *minor)
-- 
1.8.1.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] drm/i915: add error path Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-07-22 13:30 +0200
  Re: [Intel-gfx] [PATCH] drm/i915: add error path Chris Wilson <chris@chris-wilson.co.uk> - 2015-07-22 13:50 +0200
    Re: [Intel-gfx] [PATCH] drm/i915: add error path Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-07-22 14:00 +0200

csiph-web