[PATCH] cpufreq: skip frequency performance test if cpufreq_settable is false

[Alex Hung]

Signed-off-by: Alex Hung <alex.hung at canonical.com>
---
 src/cpu/cpufreq/cpufreq.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/cpu/cpufreq/cpufreq.c b/src/cpu/cpufreq/cpufreq.c
index 2ae47aa..a1cb78a 100644
--- a/src/cpu/cpufreq/cpufreq.c
+++ b/src/cpu/cpufreq/cpufreq.c
@@ -358,6 +358,10 @@ static int cpufreq_test_cpu_performance(fwts_framework *fw)
 
 	n_master_cpus = 0;
 
+	if (!cpufreq_settable) {
+		fwts_skipped(fw, "Can't set CPU frequencies");
+		return FWTS_SKIP;
+	}
 
 	for (i = 0; cpufreq_settable && i < num_cpus; i++) {
 		if (!(cpus[i].online && cpus[i].master))
@@ -368,13 +372,6 @@ static int cpufreq_test_cpu_performance(fwts_framework *fw)
 			cpufreq_settable = false;
 	}
 
-	if (!cpufreq_settable) {
-		fwts_failed(fw, LOG_LEVEL_MEDIUM,
-				"CPUFreqSetFailed",
-				"Can't set CPU frequencies");
-		return FWTS_OK;
-	}
-
 	/* then do the benchmark */
 	for (i = 0, c = 0; i < num_cpus; i++) {
 		if (!(cpus[i].online && cpus[i].master))
-- 
2.5.0