lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2011-04-15 20:19:17 -07:00
parent c98ece69fe 906c3b616d
commit e82e6f16a8
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-tegra/gpio.c
View File

@@ -257,7 +257,8 @@ static void tegra_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
void tegra_gpio_resume(void) void tegra_gpio_resume(void)
{ {
unsigned long flags; unsigned long flags;
int b, p, i; int b;
int p;
local_irq_save(flags); local_irq_save(flags);
@@ -280,7 +281,8 @@ void tegra_gpio_resume(void)
void tegra_gpio_suspend(void) void tegra_gpio_suspend(void)
{ {
unsigned long flags; unsigned long flags;
int b, p, i; int b;
int p;
local_irq_save(flags); local_irq_save(flags);
for (b = 0; b < ARRAY_SIZE(tegra_gpio_banks); b++) { for (b = 0; b < ARRAY_SIZE(tegra_gpio_banks); b++) {

9
arch/arm/mach-tegra/tegra2_clocks.c
View File

@@ -1362,14 +1362,15 @@ static int tegra_clk_shared_bus_set_rate(struct clk *c, unsigned long rate)
{ {
unsigned long flags; unsigned long flags;
int ret; int ret;
long new_rate = rate;
rate = clk_round_rate(c->parent, rate); new_rate = clk_round_rate(c->parent, new_rate);
if (rate < 0) if (new_rate < 0)
return rate; 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); ret = tegra_clk_shared_bus_update(c->parent);
spin_unlock_irqrestore(&c->parent->spinlock, flags); spin_unlock_irqrestore(&c->parent->spinlock, flags);