2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 77304b6b8aef..f7cab5e9c4d6 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -268,7 +268,7 @@ int cpuidle_enable_device(struct cpuidle_device *dev)
         if (!drv || !cpuidle_curr_governor)
                 return -EIO;
         if (!dev->state_count)
-                return -EINVAL;
+                dev->state_count = drv->state_count;
 
         if (dev->registered == 0) {
                 ret = __cpuidle_register_device(dev);
diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
index 284d7af5a9c8..40cd3f3024df 100644
--- a/drivers/cpuidle/driver.c
+++ b/drivers/cpuidle/driver.c
@@ -47,7 +47,7 @@ static void __cpuidle_register_driver(struct cpuidle_driver *drv)
  */
 int cpuidle_register_driver(struct cpuidle_driver *drv)
 {
-        if (!drv)
+        if (!drv || !drv->state_count)
                 return -EINVAL;
 
         if (cpuidle_disabled())