diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-02-25 12:27:14 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-02-25 12:27:14 -0800 |
| commit | 02fa9f0451ac639a687bfc145eefe58703ff220e (patch) | |
| tree | fe984acc78f22f6eb8fb98efaba8b1ac2f3ad8d9 /drivers/base/power/runtime.c | |
| parent | cbc9438075ca9dee3f39a2e7310f81c304b40359 (diff) | |
| parent | 51c404b2c514930e98e81e0b9294f19892a4f871 (diff) | |
Merge branch 'patches_for_2.6.38rc' of git://git.pwsan.com/linux-2.6 into devel-fixes
Diffstat (limited to 'drivers/base/power/runtime.c')
| -rw-r--r-- | drivers/base/power/runtime.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 656493a5e073..42615b419dfb 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -407,12 +407,15 @@ static int rpm_suspend(struct device *dev, int rpmflags) goto out; } + /* Maybe the parent is now able to suspend. */ if (parent && !parent->power.ignore_children && !dev->power.irq_safe) { - spin_unlock_irq(&dev->power.lock); + spin_unlock(&dev->power.lock); - pm_request_idle(parent); + spin_lock(&parent->power.lock); + rpm_idle(parent, RPM_ASYNC); + spin_unlock(&parent->power.lock); - spin_lock_irq(&dev->power.lock); + spin_lock(&dev->power.lock); } out: |