diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-04-06 14:33:13 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-06 14:33:13 -0700 |
| commit | f825071893ccddb0140448d3fcbaf4c166e9932c (patch) | |
| tree | 81d5d573984ffba67c21a9a19c77b8c48db26d7b | |
| parent | 8dbe64734df474f5990c5364fc5968e003c6e18d (diff) | |
| parent | ea093498dd23ca584466ff5b9802996451996323 (diff) | |
Merge "msm-core: Fix uninitialized sampling work"
| -rw-r--r-- | drivers/power/qcom/msm-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/qcom/msm-core.c b/drivers/power/qcom/msm-core.c index 3ac4611da9bd..43ad33ea234b 100644 --- a/drivers/power/qcom/msm-core.c +++ b/drivers/power/qcom/msm-core.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -1069,6 +1069,7 @@ static int msm_core_dev_probe(struct platform_device *pdev) if (ret) goto failed; + INIT_DEFERRABLE_WORK(&sampling_work, samplequeue_handle); ret = msm_core_task_init(&pdev->dev); if (ret) goto failed; @@ -1076,7 +1077,6 @@ static int msm_core_dev_probe(struct platform_device *pdev) for_each_possible_cpu(cpu) set_threshold(&activity[cpu]); - INIT_DEFERRABLE_WORK(&sampling_work, samplequeue_handle); schedule_delayed_work(&sampling_work, msecs_to_jiffies(0)); cpufreq_register_notifier(&cpu_policy, CPUFREQ_POLICY_NOTIFIER); pm_notifier(system_suspend_handler, 0); |