Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

1 files changed, 12 insertions, 8 deletions

diff --git a/arch/i386/kernel/cpu/cpufreq/longhaul.c b/arch/i386/kernel/cpu/cpufreq/longhaul.c
index 8ef38544453c..146f607e9c44 100644
--- a/arch/i386/kernel/cpu/cpufreq/longhaul.c
+++ b/arch/i386/kernel/cpu/cpufreq/longhaul.c
@@ -77,13 +77,17 @@ static char speedbuffer[8];
 
 static char *print_speed(int speed)
 {
-        if (speed > 1000) {
-                if (speed%1000 == 0)
-                        sprintf (speedbuffer, "%dGHz", speed/1000);
-                else
-                        sprintf (speedbuffer, "%d.%dGHz", speed/1000, (speed%1000)/100);
-        } else
-                sprintf (speedbuffer, "%dMHz", speed);
+        if (speed < 1000) {
+                snprintf(speedbuffer, sizeof(speedbuffer),"%dMHz", speed);
+                return speedbuffer;
+        }
+
+        if (speed%1000 == 0)
+                snprintf(speedbuffer, sizeof(speedbuffer),
+                        "%dGHz", speed/1000);
+        else
+                snprintf(speedbuffer, sizeof(speedbuffer),
+                        "%d.%dGHz", speed/1000, (speed%1000)/100);
 
         return speedbuffer;
 }
@@ -675,7 +679,7 @@ static int __init longhaul_init(void)
 
 static void __exit longhaul_exit(void)
 {
-        int i=0;
+        int i;
 
         for (i=0; i < numscales; i++) {
                 if (clock_ratio[i] == maxmult) {