aboutsummaryrefslogtreecommitdiff
path: root/drivers/cpuidle/cpuidle.c
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2015-04-20 13:51:21 +0800
committerAlex Shi <alex.shi@linaro.org>2015-04-20 13:51:21 +0800
commit663276faa26c2837eca83a5800b3668be19aaaff (patch)
treeaee6a1964c83eb2153bde4a4c442af88204a28a8 /drivers/cpuidle/cpuidle.c
parent667ea3959654ae48ef303df13f2635fd07766cb4 (diff)
parent5c43c539346972b9a1d5f38dc62db5a39997488d (diff)
downloadlinux-linaro-stable-663276faa26c2837eca83a5800b3668be19aaaff.tar.gz
Merge tag 'v3.14.39' into linux-linaro-lsk-v3.14
This is the 3.14.39 stable release
Diffstat (limited to 'drivers/cpuidle/cpuidle.c')
-rw-r--r--drivers/cpuidle/cpuidle.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index a55e68f2cfc8..e3d2052e7552 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -252,9 +252,6 @@ int cpuidle_enable_device(struct cpuidle_device *dev)
if (!dev->registered)
return -EINVAL;
- if (!dev->state_count)
- dev->state_count = drv->state_count;
-
ret = cpuidle_add_device_sysfs(dev);
if (ret)
return ret;