From: Alex Elder <alex.elder@linaro.org>
Date: Wed, 27 Nov 2013 15:39:49 +0000 (-0600)
Subject: clk: clean up everything on debugfs error
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=b5f98e65c0d887388eb9cbf55c76cb97fb4c2187;hp=6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae;p=~andy%2Flinux

clk: clean up everything on debugfs error

[Maybe the third time will be the charm. -Alex]

If CONFIG_COMMON_CLK_DEBUG is defined, clk_debug_create_one() is
called to populate a debugfs directory with a few entries that are
common for all clock types.

If an error happens after creating the first one debugfs_remove() is
called on the clock's directory.  The problem with this is that no
cleanup is done on the debugfs files already created in that
directory, so the directory never actually gets removed.   This
problem is silently ignored.

Fix this by calling debugfs_remove_recursive() instead.  Reset the
clk->dentry field to null afterward, to ensure it can't be mistaken
as a valid pointer.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
---

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 2cf2ea6b77a..77fcd069c64 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -272,7 +272,8 @@ static int clk_debug_create_one(struct clk *clk, struct dentry *pdentry)
 	goto out;
 
 err_out:
-	debugfs_remove(clk->dentry);
+	debugfs_remove_recursive(clk->dentry);
+	clk->dentry = NULL;
 out:
 	return ret;
 }