diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-01-26 01:06:20 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-01-26 01:06:20 +0100 |
| commit | 39909b7114425fa390ee8e2f22477bf4679f8cf3 (patch) | |
| tree | e76c25ad91ead6ba5d1caaf462c5862888fa691c /drivers | |
| parent | ec6f34e5b552fb0a52e6aae1a5afbbb1605cc6cc (diff) | |
| parent | 194fe6f28e2819d3f50fbed24c3b72f21501dbfa (diff) | |
Merge branch 'cpuidle/3.20' of http://git.linaro.org/people/daniel.lezcano/linux into pm-cpuidle
Pull ARM cpuidle update for 3.20 from Daniel Lezcano.
* 'cpuidle/3.20' of http://git.linaro.org/people/daniel.lezcano/linux:
drivers: cpuidle: Don't initialize big.LITTLE driver if MCPM is unavailable
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/cpuidle/cpuidle-big_little.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/cpuidle/cpuidle-big_little.c b/drivers/cpuidle/cpuidle-big_little.c index e3e225fe6b45..40c34faffe59 100644 --- a/drivers/cpuidle/cpuidle-big_little.c +++ b/drivers/cpuidle/cpuidle-big_little.c @@ -182,6 +182,10 @@ static int __init bl_idle_init(void) */ if (!of_match_node(compatible_machine_match, root)) return -ENODEV; + + if (!mcpm_is_available()) + return -EUNATCH; + /* * For now the differentiation between little and big cores * is based on the part number. A7 cores are considered little |