diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-07-25 10:22:29 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-07-25 10:22:29 +0200 |
commit | b79b3e05b1229d5b2fc2af71dc29701642577eba (patch) | |
tree | bcdf728ccfab02d66e129cacaa106bf8cc60f2d6 /arch/arm/plat-samsung/clock.c | |
parent | ARM: static should be at beginning of declaration (diff) | |
parent | ARM: mach-shmobile: ag5evm: SDHI requires waiting for idle (diff) | |
download | linux-b79b3e05b1229d5b2fc2af71dc29701642577eba.tar.xz linux-b79b3e05b1229d5b2fc2af71dc29701642577eba.zip |
Merge branch 'rmobile/sdio' into rmobile-latest
Diffstat (limited to 'arch/arm/plat-samsung/clock.c')
-rw-r--r-- | arch/arm/plat-samsung/clock.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/plat-samsung/clock.c b/arch/arm/plat-samsung/clock.c index 772892826ffc..0c9f95d98561 100644 --- a/arch/arm/plat-samsung/clock.c +++ b/arch/arm/plat-samsung/clock.c @@ -458,7 +458,7 @@ static struct dentry *clk_debugfs_root; static int clk_debugfs_register_one(struct clk *c) { int err; - struct dentry *d, *child, *child_tmp; + struct dentry *d; struct clk *pa = c->parent; char s[255]; char *p = s; @@ -488,10 +488,7 @@ static int clk_debugfs_register_one(struct clk *c) return 0; err_out: - d = c->dent; - list_for_each_entry_safe(child, child_tmp, &d->d_subdirs, d_u.d_child) - debugfs_remove(child); - debugfs_remove(c->dent); + debugfs_remove_recursive(c->dent); return err; } |