diff options
Diffstat (limited to 'kernel/irq/chip.c')
-rw-r--r-- | kernel/irq/chip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 043bfc35b353..c69357a43849 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c | |||
@@ -294,11 +294,11 @@ int irq_activate(struct irq_desc *desc) | |||
294 | return 0; | 294 | return 0; |
295 | } | 295 | } |
296 | 296 | ||
297 | void irq_activate_and_startup(struct irq_desc *desc, bool resend) | 297 | int irq_activate_and_startup(struct irq_desc *desc, bool resend) |
298 | { | 298 | { |
299 | if (WARN_ON(irq_activate(desc))) | 299 | if (WARN_ON(irq_activate(desc))) |
300 | return; | 300 | return 0; |
301 | irq_startup(desc, resend, IRQ_START_FORCE); | 301 | return irq_startup(desc, resend, IRQ_START_FORCE); |
302 | } | 302 | } |
303 | 303 | ||
304 | static void __irq_disable(struct irq_desc *desc, bool mask); | 304 | static void __irq_disable(struct irq_desc *desc, bool mask); |