From ddf8dabe19b1bf099a3d5ca1c579bcc676ebe3b8 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Tue, 8 Feb 2011 19:55:24 +0000
Subject: [PATCH] (from 3.0) fix bad comparison of possible frequency scaling
 governor values

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@8777 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 tools/sanity_check/systemtest.cpp | 42 +++++++++++++++----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/tools/sanity_check/systemtest.cpp b/tools/sanity_check/systemtest.cpp
index b81ad1918f..4801ac2f09 100644
--- a/tools/sanity_check/systemtest.cpp
+++ b/tools/sanity_check/systemtest.cpp
@@ -108,27 +108,27 @@ int system_uses_frequencyscaling() {
   char filename[256], buf[256];
 
   while (!done) {
-    (void) snprintf(filename, 256, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor", cpu);
-    if (0<read_string(filename, buf, 256)) {
-      if ((0!=strcmp("performance", buf)) && 
-					(0!=strcmp("powersafe", buf))) {
-				// So it's neither the "performance" nor the "powersafe" governor
-				(void) snprintf(filename, 256, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_min_freq", cpu);
-				if (read_int(filename, &min)) {
-					(void) snprintf(filename, 256, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_max_freq", cpu);
-					if (read_int(filename, &max)) {
-						if (min!=max) {
-							// wrong governor AND different frequency limits -> scaling
-							return 1;
-						}
-					} 
-				}
-      }
-    } else {
-      // couldn't open file -> no more cores
-      done = 1;
-    }
-    cpu++;
+          (void) snprintf(filename, 256, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor", cpu);
+          if (0<read_string(filename, buf, 256)) {
+                  if ((0!=strncmp("performance", buf, 11)) && 
+                      (0!=strncmp("powersafe", buf, 9))) {
+                          // So it's neither the "performance" nor the "powersafe" governor
+                          (void) snprintf(filename, 256, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_min_freq", cpu);
+                          if (read_int(filename, &min)) {
+                                  (void) snprintf(filename, 256, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_max_freq", cpu);
+                                  if (read_int(filename, &max)) {
+                                          if (min!=max) {
+                                                  // wrong governor AND different frequency limits -> scaling
+                                                  return 1;
+                                          }
+                                  } 
+                          }
+                  }
+          } else {
+                  // couldn't open file -> no more cores
+                  done = 1;
+          }
+          cpu++;
   }
   
   // couldn't find anything that points to scaling