diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-10-06 08:32:28 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-10-06 08:32:28 -0700 |
| commit | ab8d64d7d4ea49cf664ca5562263a8ba78f4541e (patch) | |
| tree | b55e5a587e2d0047fd645ba926db4fa784f2ea84 /arch/arm/mach-omap2/pm-debug.c | |
| parent | 82e865011accc9fd1e048961da7cefc4d08f3292 (diff) | |
| parent | ee894b18e064447f86019af38a90ccb091880942 (diff) | |
Merge branch 'pm-fixes-32' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-fixes-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/pm-debug.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm-debug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c index 1b4c1600f8d8..2fc4d6abbd0a 100644 --- a/arch/arm/mach-omap2/pm-debug.c +++ b/arch/arm/mach-omap2/pm-debug.c @@ -541,7 +541,7 @@ static int __init pm_dbg_init(void) printk(KERN_ERR "%s: only OMAP3 supported\n", __func__); return -ENODEV; } - + d = debugfs_create_dir("pm_debug", NULL); if (IS_ERR(d)) return PTR_ERR(d); @@ -551,7 +551,7 @@ static int __init pm_dbg_init(void) (void) debugfs_create_file("time", S_IRUGO, d, (void *)DEBUG_FILE_TIMERS, &debug_fops); - pwrdm_for_each(pwrdms_setup, (void *)d); + pwrdm_for_each_nolock(pwrdms_setup, (void *)d); pm_dbg_dir = debugfs_create_dir("registers", d); if (IS_ERR(pm_dbg_dir)) |