diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-02-10 18:18:13 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-02-10 18:18:13 -0800 |
| commit | 0482e3c6f704d25b6a4e3c940caeeacece4e6d74 (patch) | |
| tree | a8506b9b15ed9a31c2171fc7b461ef52453307b0 /arch/arm/plat-omap/clock.c | |
| parent | 9ba874506b7b3883d78b8cad61eba39c4bb09885 (diff) | |
| parent | a6c7fdd29350a74ba5f76809436de9c3d6763009 (diff) | |
Merge branch 'omap-fixes-for-linus' into omap-for-linus
Diffstat (limited to 'arch/arm/plat-omap/clock.c')
| -rw-r--r-- | arch/arm/plat-omap/clock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c index 0ae27538385..e3b58afa5dc 100644 --- a/arch/arm/plat-omap/clock.c +++ b/arch/arm/plat-omap/clock.c @@ -402,7 +402,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; @@ -434,7 +434,7 @@ static int clk_debugfs_register_one(struct clk *c) err_out: d = c->dent; - 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->dent); return err; |