From: Pavel Machek <pavel@ucw.cz>
To: viresh.kumar@linaro.org, egtvedt@samfundet.no,
jesper.nilsson@axis.com, linux@arm.linux.org.uk,
swarren@nvidia.com, andrew@lunn.ch, nicolas.pitre@linaro.org,
tianyu.lan@intel.com, rafael.j.wysocki@intel.com,
kernel list <linux-kernel@vger.kernel.org>,
tony@atomide.com, sre@ring0.de, pali.rohar@gmail.com,
arm@kernel.org
Subject: omap-cpufreq compilation breakage in 3.13-rc1
Date: Wed, 27 Nov 2013 12:54:07 +0100 [thread overview]
Message-ID: <20131127115407.GA6773@amd.pavel.ucw.cz> (raw)
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@ucw.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
next reply other threads:[~2013-11-27 11:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-27 11:54 Pavel Machek [this message]
2013-11-27 12:03 ` Sebastian Reichel
2013-11-27 15:50 ` Viresh Kumar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131127115407.GA6773@amd.pavel.ucw.cz \
--to=pavel@ucw.cz \
--cc=andrew@lunn.ch \
--cc=arm@kernel.org \
--cc=egtvedt@samfundet.no \
--cc=jesper.nilsson@axis.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=nicolas.pitre@linaro.org \
--cc=pali.rohar@gmail.com \
--cc=rafael.j.wysocki@intel.com \
--cc=sre@ring0.de \
--cc=swarren@nvidia.com \
--cc=tianyu.lan@intel.com \
--cc=tony@atomide.com \
--cc=viresh.kumar@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®