From 11a68d5bf30fca026527e7b797eaae4d0c792a2d Mon Sep 17 00:00:00 2001 From: Daniel Lezcano Date: Mon, 26 Mar 2012 14:51:26 +0200 Subject: [PATCH] --- yaml --- r: 298019 b: refs/heads/master c: fc850f39ea54c760ce438a601cfea8ab80c4898e h: refs/heads/master i: 298017: d6aa49f400ffbd9145582c5110764b55b06485fe 298015: 97bf5f8aee8e732fc169bbe6a5d583b6b827a526 v: v3 --- [refs] | 2 +- trunk/drivers/cpuidle/cpuidle.c | 2 +- trunk/drivers/cpuidle/driver.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6c48638487c8..12b272284bbb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a53396b0381ec9d5180fd8fe7a681c8ce95fd9a +refs/heads/master: fc850f39ea54c760ce438a601cfea8ab80c4898e diff --git a/trunk/drivers/cpuidle/cpuidle.c b/trunk/drivers/cpuidle/cpuidle.c index 77304b6b8aef..f7cab5e9c4d6 100644 --- a/trunk/drivers/cpuidle/cpuidle.c +++ b/trunk/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/trunk/drivers/cpuidle/driver.c b/trunk/drivers/cpuidle/driver.c index 284d7af5a9c8..40cd3f3024df 100644 --- a/trunk/drivers/cpuidle/driver.c +++ b/trunk/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())