diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2020-07-24 02:33:20 +0300 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2020-07-24 18:41:19 +0300 |
| commit | 41750a750b45cbe2640d81585dd7c0f0ca6d7882 (patch) | |
| tree | fc3c96ec828ff41189e7c1cadc4b0fda8d3cd41e /kernel/cpu_pm.c | |
| parent | d1cc3341f2d95b742bb075e309251fc2ae62a799 (diff) | |
| parent | 8476df741c780591942ed5f73ed0de39badcb8c7 (diff) | |
Merge branch 'android-4.4-p' of https://android.googlesource.com/kernel/common into lineage-17.1-caf-msm8998
This brings LA.UM.8.4.r1-05700-8x98.0 up to date with
https://android.googlesource.com/kernel/common/ android-4.4-p at commit:
8476df741c780 BACKPORT: xtables: extend matches and targets with .usersize
Conflicts:
drivers/usb/gadget/function/f_uac1.c
net/netlink/genetlink.c
sound/core/compress_offload.c
Change-Id: Id7b2fdf3942f1986edec869dcd965df632cc1c5f
Diffstat (limited to 'kernel/cpu_pm.c')
| -rw-r--r-- | kernel/cpu_pm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/cpu_pm.c b/kernel/cpu_pm.c index 774bfe7a2893..38dcb7c1c02c 100644 --- a/kernel/cpu_pm.c +++ b/kernel/cpu_pm.c @@ -100,7 +100,7 @@ EXPORT_SYMBOL_GPL(cpu_pm_unregister_notifier); */ int cpu_pm_enter(void) { - int nr_calls; + int nr_calls = 0; int ret = 0; read_lock(&cpu_pm_notifier_lock); @@ -159,7 +159,7 @@ EXPORT_SYMBOL_GPL(cpu_pm_exit); */ int cpu_cluster_pm_enter(unsigned long aff_level) { - int nr_calls; + int nr_calls = 0; int ret = 0; read_lock(&cpu_pm_notifier_lock); |