From 34d14e41a38e6aadba3bdb769eb39ef84ea4d43a Mon Sep 17 00:00:00 2001 From: viresh kumar Date: Tue, 23 Oct 2012 01:23:43 +0200 Subject: [PATCH] --- yaml --- r: 336703 b: refs/heads/master c: 4b972f0b04eaae645b22d99479b9aea43c3d64e7 h: refs/heads/master i: 336701: 780f700835068569cb3c4851c4c113c2bd55d902 336699: 3a189648071ea88c9a2a91e1298dab7a7e1549c5 336695: 1f878054607b5f3e8ece766afbf64139b94114d6 336687: 515484ddb7bcf414c8060bd6153de0382690a781 336671: 68dc67e4d50983bb9b345d93f7c0ec525c7b7c3a 336639: 06cb8aea094fed5c94c6cb763a9aa8dd4dc2de9b v: v3 --- [refs] | 2 +- trunk/drivers/cpufreq/cpufreq.c | 6 +++--- trunk/include/linux/cpufreq.h | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 741b27262c73..eeaed8b111e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8bf1ac723639c4260f76df0e45ee23aa35a23067 +refs/heads/master: 4b972f0b04eaae645b22d99479b9aea43c3d64e7 diff --git a/trunk/drivers/cpufreq/cpufreq.c b/trunk/drivers/cpufreq/cpufreq.c index 021973b7dc56..db6e337ad337 100644 --- a/trunk/drivers/cpufreq/cpufreq.c +++ b/trunk/drivers/cpufreq/cpufreq.c @@ -445,7 +445,7 @@ static ssize_t show_scaling_governor(struct cpufreq_policy *policy, char *buf) else if (policy->policy == CPUFREQ_POLICY_PERFORMANCE) return sprintf(buf, "performance\n"); else if (policy->governor) - return scnprintf(buf, CPUFREQ_NAME_LEN, "%s\n", + return scnprintf(buf, CPUFREQ_NAME_PLEN, "%s\n", policy->governor->name); return -EINVAL; } @@ -491,7 +491,7 @@ static ssize_t store_scaling_governor(struct cpufreq_policy *policy, */ static ssize_t show_scaling_driver(struct cpufreq_policy *policy, char *buf) { - return scnprintf(buf, CPUFREQ_NAME_LEN, "%s\n", cpufreq_driver->name); + return scnprintf(buf, CPUFREQ_NAME_PLEN, "%s\n", cpufreq_driver->name); } /** @@ -512,7 +512,7 @@ static ssize_t show_scaling_available_governors(struct cpufreq_policy *policy, if (i >= (ssize_t) ((PAGE_SIZE / sizeof(char)) - (CPUFREQ_NAME_LEN + 2))) goto out; - i += scnprintf(&buf[i], CPUFREQ_NAME_LEN, "%s ", t->name); + i += scnprintf(&buf[i], CPUFREQ_NAME_PLEN, "%s ", t->name); } out: i += sprintf(&buf[i], "\n"); diff --git a/trunk/include/linux/cpufreq.h b/trunk/include/linux/cpufreq.h index b60f6ba01d0c..fc4b78510151 100644 --- a/trunk/include/linux/cpufreq.h +++ b/trunk/include/linux/cpufreq.h @@ -22,6 +22,8 @@ #include #define CPUFREQ_NAME_LEN 16 +/* Print length for names. Extra 1 space for accomodating '\n' in prints */ +#define CPUFREQ_NAME_PLEN (CPUFREQ_NAME_LEN + 1) /*********************************************************************