]> Pileus Git - ~andy/linux/commitdiff
ARM: OMAP4: CPUidle: Avoid double idle driver registration
authorSantosh Shilimkar <santosh.shilimkar@ti.com>
Mon, 25 Mar 2013 10:05:04 +0000 (15:35 +0530)
committerKevin Hilman <khilman@linaro.org>
Tue, 9 Apr 2013 16:44:49 +0000 (09:44 -0700)
OMAP4 CPUidle driver registration call is under a loop which leads
to calling cpuidle_register_driver twice which is not intended.

Fix it by moving the driver registration outside the loop.

Reported-by: Nishanth Menon <nm@ti.com>
Acked-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
arch/arm/mach-omap2/cpuidle44xx.c

index f4b1b234939e3e02c9588e3dceb743c9ae5e90fd..72c5407fdd12531fb630efa10ae3f767cefe8b7e 100644 (file)
@@ -222,14 +222,14 @@ int __init omap4_idle_init(void)
        if (!cpu_clkdm[0] || !cpu_clkdm[1])
                return -ENODEV;
 
+       cpuidle_register_driver(&omap4_idle_driver);
+
        for_each_cpu(cpu_id, cpu_online_mask) {
                dev = &per_cpu(omap4_idle_dev, cpu_id);
                dev->cpu = cpu_id;
 #ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED
                dev->coupled_cpus = *cpu_online_mask;
 #endif
-               cpuidle_register_driver(&omap4_idle_driver);
-
                if (cpuidle_register_device(dev)) {
                        pr_err("%s: CPUidle register failed\n", __func__);
                        return -EIO;