diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-09-10 14:53:27 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-09-10 15:04:19 +0200 |
| commit | d5bbf34613a877dbe3da847fa0432da8c6721e73 (patch) | |
| tree | 902a90fd7eda61aad7abae9c35b0da2e7a786995 /drivers/base/syscore.c | |
| parent | c6c1f7a2c194f1a2291a15c6691c0d6785f8976e (diff) | |
| parent | 336961dd3cf9c39456dd9657e8f205718740c797 (diff) | |
Merge branch 'l4t/l4t-r16' into colibri
Merge with latest NVIDIA L4T R16.
Only real conflict concerning inverted VBUS gpio support.
Diffstat (limited to 'drivers/base/syscore.c')
| -rw-r--r-- | drivers/base/syscore.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c index e8d11b6630ee..0240f01714a1 100644 --- a/drivers/base/syscore.c +++ b/drivers/base/syscore.c @@ -97,12 +97,16 @@ void syscore_resume(void) list_for_each_entry(ops, &syscore_ops_list, node) if (ops->resume) { - if (initcall_debug) - pr_info("PM: Calling %pF\n", ops->resume); ops->resume(); WARN_ONCE(!irqs_disabled(), "Interrupts enabled after %pF\n", ops->resume); } + if (initcall_debug) { + list_for_each_entry(ops, &syscore_ops_list, node) + if (ops->resume) { + pr_info("PM: Called %pF\n", ops->resume); + } + } } EXPORT_SYMBOL_GPL(syscore_resume); #endif /* CONFIG_PM_SLEEP */ |