mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 06:03:36 -04:00
Merge "cpuidle: lpm-levels: Set suspend and s2idle ops later during probe"
This commit is contained in:
commit
78d04271f7
1 changed files with 4 additions and 2 deletions
|
|
@ -1758,8 +1758,6 @@ static int lpm_probe(struct platform_device *pdev)
|
|||
* core. BUG in existing code but no known issues possibly because of
|
||||
* how late lpm_levels gets initialized.
|
||||
*/
|
||||
suspend_set_ops(&lpm_suspend_ops);
|
||||
s2idle_set_ops(&lpm_s2idle_ops);
|
||||
for_each_possible_cpu(cpu) {
|
||||
cpu_histtimer = &per_cpu(histtimer, cpu);
|
||||
hrtimer_init(cpu_histtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
|
||||
|
|
@ -1807,11 +1805,15 @@ static int lpm_probe(struct platform_device *pdev)
|
|||
goto failed;
|
||||
}
|
||||
|
||||
suspend_set_ops(&lpm_suspend_ops);
|
||||
s2idle_set_ops(&lpm_s2idle_ops);
|
||||
|
||||
return 0;
|
||||
failed:
|
||||
free_cluster_node(lpm_root_node);
|
||||
lpm_root_node = NULL;
|
||||
dma_free_coherent(&pdev->dev, size, lpm_debug, lpm_debug_phys);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue