AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

PM / Runtime: fix recursive locking warning of lockdep from rpm_resume()

Browse Source 
For device with no_callbacks flag set, its power lock and its parent's
power lock may be held nestedly in rpm_resume, so we should take
spin_lock_nested(lock, SINGLE_DEPTH_NESTING) to acquire parent power lock
to avoid lockdep warning.

Signed-off-by: Ming Lei <tom.leiming@gmail.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
Ming Lei 2010-10-22 23:48:14 +02:00 committed by Rafael J. Wysocki
parent 9c03439253
commit d63be5f924
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/base/power/runtime.c
View File

@ -503,7 +503,7 @@ static int rpm_resume(struct device *dev, int rpmflags)
* the resume will actually succeed. * the resume will actually succeed.
*/ */
if (dev->power.no_callbacks && !parent && dev->parent) { if (dev->power.no_callbacks && !parent && dev->parent) {
spin_lock(&dev->parent->power.lock); spin_lock_nested(&dev->parent->power.lock, SINGLE_DEPTH_NESTING);
if (dev->parent->power.disable_depth > 0 if (dev->parent->power.disable_depth > 0
|| dev->parent->power.ignore_children || dev->parent->power.ignore_children
|| dev->parent->power.runtime_status == RPM_ACTIVE) { || dev->parent->power.runtime_status == RPM_ACTIVE) {