Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e82e6f16 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents c98ece69 906c3b61

arch/arm/mach-tegra/gpio.c

+4 −2
Original line number Diff line number Diff line
@@ -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++) {

arch/arm/mach-tegra/tegra2_clocks.c

+5 −4
Original line number Diff line number Diff line
@@ -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);