diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-06 03:56:14 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-06 03:56:14 +0400 |
| commit | 549f11c9f0f35bbd131e6205025626873b4a6fdb (patch) | |
| tree | 1a3d506c923a6a077a6e973e2c4cf9111f40f0b0 /drivers/irqchip/spear-shirq.c | |
| parent | e1a08b855f56d6528e7f85aae9ca8123f4c3ae04 (diff) | |
| parent | 8844aad89ed61545b4db6a3467e1b21ca1c49460 (diff) | |
| download | linux-549f11c9f0f35bbd131e6205025626873b4a6fdb.tar.xz | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Thomas Gleixner:
"A few minor fixlets in ARM SoC irq drivers and a fix for a memory leak
which I introduced in the last round of cleanups :("
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
genirq: Fix memory leak when calling irq_free_hwirqs()
irqchip: spear_shirq: Fix interrupt offset
irqchip: brcmstb-l2: Level-2 interrupts are edge sensitive
irqchip: armada-370-xp: Mask all interrupts during initialization.
Diffstat (limited to 'drivers/irqchip/spear-shirq.c')
| -rw-r--r-- | drivers/irqchip/spear-shirq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/spear-shirq.c b/drivers/irqchip/spear-shirq.c index 3fdda3a40269..6ce6bd3441bf 100644 --- a/drivers/irqchip/spear-shirq.c +++ b/drivers/irqchip/spear-shirq.c @@ -125,7 +125,7 @@ static struct spear_shirq spear320_shirq_ras2 = { }; static struct spear_shirq spear320_shirq_ras3 = { - .irq_nr = 3, + .irq_nr = 7, .irq_bit_off = 0, .invalid_irq = 1, .regs = { |