|
@@ -103,13 +103,6 @@ static int __init arm_idle_init_cpu(int cpu)
|
|
goto out_kfree_drv;
|
|
goto out_kfree_drv;
|
|
}
|
|
}
|
|
|
|
|
|
- ret = cpuidle_register_driver(drv);
|
|
|
|
- if (ret) {
|
|
|
|
- if (ret != -EBUSY)
|
|
|
|
- pr_err("Failed to register cpuidle driver\n");
|
|
|
|
- goto out_kfree_drv;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
/*
|
|
/*
|
|
* Call arch CPU operations in order to initialize
|
|
* Call arch CPU operations in order to initialize
|
|
* idle states suspend back-end specific data
|
|
* idle states suspend back-end specific data
|
|
@@ -117,15 +110,20 @@ static int __init arm_idle_init_cpu(int cpu)
|
|
ret = arm_cpuidle_init(cpu);
|
|
ret = arm_cpuidle_init(cpu);
|
|
|
|
|
|
/*
|
|
/*
|
|
- * Skip the cpuidle device initialization if the reported
|
|
|
|
|
|
+ * Allow the initialization to continue for other CPUs, if the reported
|
|
* failure is a HW misconfiguration/breakage (-ENXIO).
|
|
* failure is a HW misconfiguration/breakage (-ENXIO).
|
|
*/
|
|
*/
|
|
- if (ret == -ENXIO)
|
|
|
|
- return 0;
|
|
|
|
-
|
|
|
|
if (ret) {
|
|
if (ret) {
|
|
pr_err("CPU %d failed to init idle CPU ops\n", cpu);
|
|
pr_err("CPU %d failed to init idle CPU ops\n", cpu);
|
|
- goto out_unregister_drv;
|
|
|
|
|
|
+ ret = ret == -ENXIO ? 0 : ret;
|
|
|
|
+ goto out_kfree_drv;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ ret = cpuidle_register_driver(drv);
|
|
|
|
+ if (ret) {
|
|
|
|
+ if (ret != -EBUSY)
|
|
|
|
+ pr_err("Failed to register cpuidle driver\n");
|
|
|
|
+ goto out_kfree_drv;
|
|
}
|
|
}
|
|
|
|
|
|
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
|
|
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
|