tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds e82e6f16 c98ece69

+9 -6
+4 -2
arch/arm/mach-tegra/gpio.c
··· 257 257 void tegra_gpio_resume(void) 258 258 { 259 259 unsigned long flags; 260 - int b, p, i; 260 + int b; 261 + int p; 261 262 262 263 local_irq_save(flags); 263 264 ··· 281 280 void tegra_gpio_suspend(void) 282 281 { 283 282 unsigned long flags; 284 - int b, p, i; 283 + int b; 284 + int p; 285 285 286 286 local_irq_save(flags); 287 287 for (b = 0; b < ARRAY_SIZE(tegra_gpio_banks); b++) {
+5 -4
arch/arm/mach-tegra/tegra2_clocks.c
··· 1362 1362 { 1363 1363 unsigned long flags; 1364 1364 int ret; 1365 + long new_rate = rate; 1365 1366 1366 - rate = clk_round_rate(c->parent, rate); 1367 - if (rate < 0) 1368 - return rate; 1367 + new_rate = clk_round_rate(c->parent, new_rate); 1368 + if (new_rate < 0) 1369 + return new_rate; 1369 1370 1370 1371 spin_lock_irqsave(&c->parent->spinlock, flags); 1371 1372 1372 - c->u.shared_bus_user.rate = rate; 1373 + c->u.shared_bus_user.rate = new_rate; 1373 1374 ret = tegra_clk_shared_bus_update(c->parent); 1374 1375 1375 1376 spin_unlock_irqrestore(&c->parent->spinlock, flags);