1 files changed, 9 insertions, 6 deletions

diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
index 424bc8105387..87db3877fead 100644
--- a/drivers/cpuidle/driver.c
+++ b/drivers/cpuidle/driver.c
@@ -18,9 +18,10 @@ static struct cpuidle_driver *cpuidle_curr_driver;
 DEFINE_SPINLOCK(cpuidle_driver_lock);
 int cpuidle_driver_refcount;
 
-static void __cpuidle_register_driver(struct cpuidle_driver *drv)
+static void set_power_states(struct cpuidle_driver *drv)
 {
         int i;
+
         /*
          * cpuidle driver should set the drv->power_specified bit
          * before registering if the driver provides
@@ -35,10 +36,8 @@ static void __cpuidle_register_driver(struct cpuidle_driver *drv)
          * an power value of -1.  So we use -2, -3, etc, for other
          * c-states.
          */
-        if (!drv->power_specified) {
-                for (i = CPUIDLE_DRIVER_STATE_START; i < drv->state_count; i++)
-                        drv->states[i].power_usage = -1 - i;
-        }
+        for (i = CPUIDLE_DRIVER_STATE_START; i < drv->state_count; i++)
+                drv->states[i].power_usage = -1 - i;
 }
 
 /**
@@ -58,8 +57,12 @@ int cpuidle_register_driver(struct cpuidle_driver *drv)
                 spin_unlock(&cpuidle_driver_lock);
                 return -EBUSY;
         }
-        __cpuidle_register_driver(drv);
+
+        if (!drv->power_specified)
+                set_power_states(drv);
+
         cpuidle_curr_driver = drv;
+
         spin_unlock(&cpuidle_driver_lock);
 
         return 0;