summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-05-15 12:34:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-05-15 12:34:05 -0700
commit214e9f723e7581c7c51677bdf382cb678d850a9f (patch)
treeeeda8de58f061169dddfd98874ce439df51e1f5e
parentc4d0bcc228dd39e1f2286685d6224d436da6622e (diff)
parent9cf82e72ec449b4516843377ac7a20abe300c64f (diff)
downloadlinux-214e9f723e7581c7c51677bdf382cb678d850a9f.tar.bz2
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fix from Ingo Molnar: "A tegra irqchip driver memory corruption fix" * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irqchip: tegra: Set the proper base address in irq chip data
-rw-r--r--drivers/irqchip/irq-tegra.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-tegra.c b/drivers/irqchip/irq-tegra.c
index 51c485d9a877..f67bbd80433e 100644
--- a/drivers/irqchip/irq-tegra.c
+++ b/drivers/irqchip/irq-tegra.c
@@ -264,7 +264,7 @@ static int tegra_ictlr_domain_alloc(struct irq_domain *domain,
irq_domain_set_hwirq_and_chip(domain, virq + i, hwirq + i,
&tegra_ictlr_chip,
- &info->base[ictlr]);
+ info->base[ictlr]);
}
parent_args = *args;