projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
mips
/
sni
/
irq.c
diff --git
a/arch/mips/sni/irq.c
b/arch/mips/sni/irq.c
index ad5fc471a0046b28f535f71a3b6c30cea87bf3a7..e8e72bb3a9afa13e2a0f91655be9af684f2d81fe 100644
(file)
--- a/
arch/mips/sni/irq.c
+++ b/
arch/mips/sni/irq.c
@@
-35,14
+35,14
@@
static irqreturn_t sni_isa_irq_handler(int dummy, void *p)
if (unlikely(irq < 0))
return IRQ_NONE;
-
do_IRQ
(irq);
+
generic_handle_irq
(irq);
return IRQ_HANDLED;
}
struct irqaction sni_isa_irq = {
.handler = sni_isa_irq_handler,
.name = "ISA",
- .flags =
SA_SHIRQ
+ .flags =
IRQF_SHARED | IRQF_DISABLED
};
/*