diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-15 20:19:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-15 20:19:17 -0700 |
| commit | e82e6f16a809bc47eb929c3408921def28638fcd (patch) | |
| tree | e211abc7646e5a39a67b1d235a08bfd9136f68ca | |
| parent | c98ece69fecf246b9e168f4ddd7d90de4027b298 (diff) | |
| parent | 906c3b616dcf8e64b11d7d665d62f5e9940f4d46 (diff) | |
| download | linux-3.10-e82e6f16a809bc47eb929c3408921def28638fcd.tar.gz linux-3.10-e82e6f16a809bc47eb929c3408921def28638fcd.tar.bz2 linux-3.10-e82e6f16a809bc47eb929c3408921def28638fcd.zip | |
Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra
* 'for-linus' of git://android.git.kernel.org/kernel/tegra:
arm: tegra: fix error check in tegra2_clocks.c
ARM: tegra: gpio: Fix unused variable warnings
| -rw-r--r-- | arch/arm/mach-tegra/gpio.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/tegra2_clocks.c | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/arch/arm/mach-tegra/gpio.c b/arch/arm/mach-tegra/gpio.c index 76a3f654220..65a1aba6823 100644 --- a/arch/arm/mach-tegra/gpio.c +++ b/arch/arm/mach-tegra/gpio.c @@ -257,7 +257,8 @@ static void tegra_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) void tegra_gpio_resume(void) { unsigned long flags; - int b, p, i; + int b; + int p; local_irq_save(flags); @@ -280,7 +281,8 @@ void tegra_gpio_resume(void) void tegra_gpio_suspend(void) { unsigned long flags; - int b, p, i; + int b; + int p; local_irq_save(flags); for (b = 0; b < ARRAY_SIZE(tegra_gpio_banks); b++) { diff --git a/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c index 6d7c4eea4dc..4459470c052 100644 --- 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; + 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); - 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); |