diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2019-04-27 22:43:49 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-27 14:46:34 +0100 |
| commit | 1229ccad5380c4b97874bdb4d9e6c7d639417151 (patch) | |
| tree | 0222396f116c48c3e6f4c027ec66edc6803683a7 /arch/arm/mach-rpc | |
| parent | 6f6200cb6dc2fb7a55a218e23806c140fc89ad2e (diff) | |
ARM: riscpc: fix lack of keyboard interrupts after irq conversion
[ Upstream commit 63a0666bca9311f35017be454587f3ba903644b8 ]
Fix lack of keyboard interrupts for RiscPC due to incorrect conversion.
Fixes: e8d36d5dbb6a ("ARM: kill off set_irq_flags usage")
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch/arm/mach-rpc')
| -rw-r--r-- | arch/arm/mach-rpc/irq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-rpc/irq.c b/arch/arm/mach-rpc/irq.c index b8a61cb11207..7f0f40178634 100644 --- a/arch/arm/mach-rpc/irq.c +++ b/arch/arm/mach-rpc/irq.c @@ -118,7 +118,7 @@ extern unsigned char rpc_default_fiq_start, rpc_default_fiq_end; void __init rpc_init_irq(void) { - unsigned int irq, clr, set = 0; + unsigned int irq, clr, set; iomd_writeb(0, IOMD_IRQMASKA); iomd_writeb(0, IOMD_IRQMASKB); @@ -130,6 +130,7 @@ void __init rpc_init_irq(void) for (irq = 0; irq < NR_IRQS; irq++) { clr = IRQ_NOREQUEST; + set = 0; if (irq <= 6 || (irq >= 9 && irq <= 15)) clr |= IRQ_NOPROBE; |