Merge "msm-core: Fix uninitialized sampling work"

This commit is contained in:
Linux Build Service Account 2017-04-06 14:33:13 -07:00 committed by Gerrit - the friendly Code Review server
commit f825071893

View file

@ -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);