| From d3786704c31ffc289ba20676d5f925d941d15c7c Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 27 Apr 2019 22:43:49 +0100 |
| Subject: ARM: riscpc: fix lack of keyboard interrupts after irq conversion |
| |
| From: Russell King <rmk+kernel@armlinux.org.uk> |
| |
| [ 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> |
| --- |
| arch/arm/mach-rpc/irq.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/arch/arm/mach-rpc/irq.c b/arch/arm/mach-rpc/irq.c |
| index 66502e6207fea..fce7fecbd8fa4 100644 |
| --- a/arch/arm/mach-rpc/irq.c |
| +++ b/arch/arm/mach-rpc/irq.c |
| @@ -117,7 +117,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); |
| @@ -129,6 +129,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; |
| -- |
| 2.20.1 |
| |
