diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-02-02 03:33:45 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-02-02 03:33:45 +0100 |
| commit | 9d3f1881abeae0494a27716b08fcf2d3264bb0fa (patch) | |
| tree | f457dd2d35af29bc831b93865efa47229d0b9bee /arch/sh/kernel/cpu | |
| parent | sh: Improved multi-resource handling for SH7780 PCI. (diff) | |
| parent | sh: Fix access to released memory in clk_debugfs_register_one() (diff) | |
| download | linux-9d3f1881abeae0494a27716b08fcf2d3264bb0fa.tar.xz linux-9d3f1881abeae0494a27716b08fcf2d3264bb0fa.zip | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/sh/kernel/cpu')
| -rw-r--r-- | arch/sh/kernel/cpu/clock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/cpu/clock.c b/arch/sh/kernel/cpu/clock.c index f3a46be2ae81..83da5debeedf 100644 --- a/arch/sh/kernel/cpu/clock.c +++ b/arch/sh/kernel/cpu/clock.c @@ -598,7 +598,7 @@ static struct dentry *clk_debugfs_root; static int clk_debugfs_register_one(struct clk *c) { int err; - struct dentry *d, *child; + struct dentry *d, *child, *child_tmp; struct clk *pa = c->parent; char s[255]; char *p = s; @@ -630,7 +630,7 @@ static int clk_debugfs_register_one(struct clk *c) err_out: d = c->dentry; - list_for_each_entry(child, &d->d_subdirs, d_u.d_child) + list_for_each_entry_safe(child, child_tmp, &d->d_subdirs, d_u.d_child) debugfs_remove(child); debugfs_remove(c->dentry); return err; |