diff options
| author | Iliyan Malchev <malchev@google.com> | 2011-07-21 22:49:24 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-07-21 22:49:24 -0700 |
| commit | 906e0c20ac0901bc298f18c4d72ee96dfcae7092 (patch) | |
| tree | b5a55999749ed139a57df82dfdcda6e195bb6610 /kernel | |
| parent | dcd3d81bcccec5de08701eeb25c17f35b0b1cf45 (diff) | |
| parent | 0b893f0f37736c1e26655f04d51706dfba417171 (diff) | |
| download | kernel_samsung_tuna-906e0c20ac0901bc298f18c4d72ee96dfcae7092.zip kernel_samsung_tuna-906e0c20ac0901bc298f18c4d72ee96dfcae7092.tar.gz kernel_samsung_tuna-906e0c20ac0901bc298f18c4d72ee96dfcae7092.tar.bz2 | |
Merge branch 'android-3.0' into android-omap-3.0
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/earlysuspend.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/kernel/power/earlysuspend.c b/kernel/power/earlysuspend.c index 84bed51..b15f02e 100644 --- a/kernel/power/earlysuspend.c +++ b/kernel/power/earlysuspend.c @@ -26,6 +26,7 @@ enum { DEBUG_USER_STATE = 1U << 0, DEBUG_SUSPEND = 1U << 2, + DEBUG_VERBOSE = 1U << 3, }; static int debug_mask = DEBUG_USER_STATE; module_param_named(debug_mask, debug_mask, int, S_IRUGO | S_IWUSR | S_IWGRP); @@ -94,8 +95,11 @@ static void early_suspend(struct work_struct *work) if (debug_mask & DEBUG_SUSPEND) pr_info("early_suspend: call handlers\n"); list_for_each_entry(pos, &early_suspend_handlers, link) { - if (pos->suspend != NULL) + if (pos->suspend != NULL) { + if (debug_mask & DEBUG_VERBOSE) + pr_info("early_suspend: calling %pf\n", pos->suspend); pos->suspend(pos); + } } mutex_unlock(&early_suspend_lock); @@ -131,9 +135,14 @@ static void late_resume(struct work_struct *work) } if (debug_mask & DEBUG_SUSPEND) pr_info("late_resume: call handlers\n"); - list_for_each_entry_reverse(pos, &early_suspend_handlers, link) - if (pos->resume != NULL) + list_for_each_entry_reverse(pos, &early_suspend_handlers, link) { + if (pos->resume != NULL) { + if (debug_mask & DEBUG_VERBOSE) + pr_info("late_resume: calling %pf\n", pos->resume); + pos->resume(pos); + } + } if (debug_mask & DEBUG_SUSPEND) pr_info("late_resume: done\n"); abort: |