git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[pandora-kernel.git]
/
arch
/
arm
/
mach-tegra
/
tegra2_clocks.c
diff --git
a/arch/arm/mach-tegra/tegra2_clocks.c
b/arch/arm/mach-tegra/tegra2_clocks.c
index
6d7c4ee
..
4459470
100644
(file)
--- a/
arch/arm/mach-tegra/tegra2_clocks.c
+++ b/
arch/arm/mach-tegra/tegra2_clocks.c
@@
-1362,14
+1362,15
@@
static int tegra_clk_shared_bus_set_rate(struct clk *c, unsigned long rate)
{
unsigned long flags;
int ret;
{
unsigned long flags;
int ret;
+ long new_rate = rate;
-
rate = clk_round_rate(c->parent,
rate);
- if (rate < 0)
- return rate;
+
new_rate = clk_round_rate(c->parent, new_
rate);
+ if (
new_
rate < 0)
+ return
new_
rate;
spin_lock_irqsave(&c->parent->spinlock, flags);
spin_lock_irqsave(&c->parent->spinlock, flags);
- c->u.shared_bus_user.rate = rate;
+ c->u.shared_bus_user.rate =
new_
rate;
ret = tegra_clk_shared_bus_update(c->parent);
spin_unlock_irqrestore(&c->parent->spinlock, flags);
ret = tegra_clk_shared_bus_update(c->parent);
spin_unlock_irqrestore(&c->parent->spinlock, flags);