linux-kernel - omap-cpufreq compilation breakage in 3.13-rc1

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20131127115407.GA6773@amd.pavel.ucw.cz>
Date:	Wed, 27 Nov 2013 12:54:07 +0100
From:	Pavel Machek <pavel@....cz>
To:	viresh.kumar@...aro.org, egtvedt@...fundet.no,
	jesper.nilsson@...s.com, linux@....linux.org.uk,
	swarren@...dia.com, andrew@...n.ch, nicolas.pitre@...aro.org,
	tianyu.lan@...el.com, rafael.j.wysocki@...el.com,
	kernel list <linux-kernel@...r.kernel.org>, tony@...mide.com,
	sre@...g0.de, pali.rohar@...il.com, arm@...nel.org
Subject: omap-cpufreq compilation breakage in 3.13-rc1


Commit d4019f0a92ab802f385cc9c8ad3ab7b5449712cb broke compilation for
omap-cpufreq.c . Given impresive list of ACKs and Tested-bys, I'd not
expect such problem. This fixes it.

Signed-off-by: Pavel Machek <pavel@....cz>

diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c
index be6d143..96c9ee49 100644
--- a/drivers/cpufreq/omap-cpufreq.c
+++ b/drivers/cpufreq/omap-cpufreq.c
@@ -56,6 +56,7 @@ static int omap_target(struct cpufreq_policy *policy, unsigned int index)
 	struct dev_pm_opp *opp;
 	unsigned long freq, volt = 0, volt_old = 0, tol = 0;
 	unsigned int old_freq, new_freq;
+	long ret;
 
 	old_freq = omap_getspeed(policy->cpu);
 	new_freq = freq_table[index].frequency;
@@ -91,6 +92,7 @@ static int omap_target(struct cpufreq_policy *policy, unsigned int index)
 
 	/* scaling up?  scale voltage before frequency */
 	if (mpu_reg && (new_freq > old_freq)) {
+		long r;
 		r = regulator_set_voltage(mpu_reg, volt - tol, volt + tol);
 		if (r < 0) {
 			dev_warn(mpu_dev, "%s: unable to scale voltage up.\n",
@@ -103,6 +105,7 @@ static int omap_target(struct cpufreq_policy *policy, unsigned int index)
 
 	/* scaling down?  scale voltage after frequency */
 	if (mpu_reg && (new_freq < old_freq)) {
+		long r;
 		r = regulator_set_voltage(mpu_reg, volt - tol, volt + tol);
 		if (r < 0) {
 			dev_warn(mpu_dev, "%s: unable to scale voltage down.\n",

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/