]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
cpufreq: Fix and clean up show_cpuinfo_cur_freq()
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 14 Mar 2017 23:12:16 +0000 (00:12 +0100)
committerThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Thu, 6 Apr 2017 08:24:32 +0000 (09:24 +0100)
BugLink: http://bugs.launchpad.net/bugs/1676424
commit 9b4f603e7a9f4282aec451063ffbbb8bb410dcd9 upstream.

There is a missing newline in show_cpuinfo_cur_freq(), so add it,
but while at it clean that function up somewhat too.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
drivers/cpufreq/cpufreq.c

index 0d84ff6318d6edc949ae06354a3e61c3936ed1b9..d34534974f7556a7c2c831c9ff343404c6fe3dcf 100644 (file)
@@ -626,9 +626,11 @@ static ssize_t show_cpuinfo_cur_freq(struct cpufreq_policy *policy,
                                        char *buf)
 {
        unsigned int cur_freq = __cpufreq_get(policy);
-       if (!cur_freq)
-               return sprintf(buf, "<unknown>");
-       return sprintf(buf, "%u\n", cur_freq);
+
+       if (cur_freq)
+               return sprintf(buf, "%u\n", cur_freq);
+
+       return sprintf(buf, "<unknown>\n");
 }
 
 /**