diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-26 20:31:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-26 20:31:05 -0400 |
| commit | d2d8f66bb991757e360728da77920e18bd678767 (patch) | |
| tree | 35153633d38767991410013d2acd354c80bc0aec /drivers/base | |
| parent | 474829e875ab93512dbe0a713f564d3cd3874bc9 (diff) | |
| parent | d63be5f924cf054e7ac18bb2761f9533039fb076 (diff) | |
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM / Runtime: fix recursive locking warning of lockdep from rpm_resume()
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/power/runtime.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 1dd8676d7f55..126ca492dd08 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c | |||
| @@ -503,7 +503,7 @@ static int rpm_resume(struct device *dev, int rpmflags) | |||
| 503 | * the resume will actually succeed. | 503 | * the resume will actually succeed. |
| 504 | */ | 504 | */ |
| 505 | if (dev->power.no_callbacks && !parent && dev->parent) { | 505 | if (dev->power.no_callbacks && !parent && dev->parent) { |
| 506 | spin_lock(&dev->parent->power.lock); | 506 | spin_lock_nested(&dev->parent->power.lock, SINGLE_DEPTH_NESTING); |
| 507 | if (dev->parent->power.disable_depth > 0 | 507 | if (dev->parent->power.disable_depth > 0 |
| 508 | || dev->parent->power.ignore_children | 508 | || dev->parent->power.ignore_children |
| 509 | || dev->parent->power.runtime_status == RPM_ACTIVE) { | 509 | || dev->parent->power.runtime_status == RPM_ACTIVE) { |