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

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