diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-15 12:34:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-15 12:34:05 -0700 |
| commit | 214e9f723e7581c7c51677bdf382cb678d850a9f (patch) | |
| tree | eeda8de58f061169dddfd98874ce439df51e1f5e | |
| parent | c4d0bcc228dd39e1f2286685d6224d436da6622e (diff) | |
| parent | 9cf82e72ec449b4516843377ac7a20abe300c64f (diff) | |
| download | linux-214e9f723e7581c7c51677bdf382cb678d850a9f.tar.gz | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-tegra.c b/drivers/irqchip/irq-tegra.c index 51c485d9a87736..f67bbd80433e8c 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; |