Merge "msm-core: Fix uninitialized sampling work" (8bcb6632) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/power/qcom/msm-core.c

+2 −2

Original line number	Diff line number	Diff line
		/* 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);