Merge tag 'fbdev-updates-for-3.4' of git://github.com/schandinat/linux-2.6

[mv-sheeva.git] / drivers / idle / intel_idle.c

diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 1c15e9b3357567f7845452bf38b6796fb11b1a50..d0f59c3f87eff08c9af04bd7d13f2b91e6f3ea17 100644 (file)
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -507,8 +507,7 @@ int intel_idle_cpu_init(int cpu)
                int num_substates;
 
                if (cstate > max_cstate) {
-                       printk(PREFIX "max_cstate %d reached\n",
-                              max_cstate);
+                       printk(PREFIX "max_cstate %d reached\n", max_cstate);
                        break;
                }
 
@@ -524,8 +523,9 @@ int intel_idle_cpu_init(int cpu)
                dev->states_usage[dev->state_count].driver_data =
                        (void *)get_driver_data(cstate);
 
-                       dev->state_count += 1;
-               }
+               dev->state_count += 1;
+       }
+
        dev->cpu = cpu;
 
        if (cpuidle_register_device(dev)) {