diff options
| author |   Magnus Damm <damm@opensource.se> | 2010-03-10 09:31:01 +0000 |
|---|---|---|
| committer |   Paul Mundt <lethal@linux-sh.org> | 2010-03-19 16:45:31 +0900 |
| commit | 01e9651a21bc0e6731da733593e4aaf4cf46b5e5 (patch) | |
| tree | 133befa54fca69f3b4c4bc1ffcc621bb5fb4f9b0 /include/linux/sh_intc.h | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin (diff) | |
| download | linux-dev-01e9651a21bc0e6731da733593e4aaf4cf46b5e5.tar.xz linux-dev-01e9651a21bc0e6731da733593e4aaf4cf46b5e5.zip | |
sh: add INTC out of memory error handling
Extend the INTC code to warn and return an error code
in the case of memory allocation failure.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include/linux/sh_intc.h')
| -rw-r--r-- | include/linux/sh_intc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sh_intc.h b/include/linux/sh_intc.h index 51d288d8ac88..df3777035936 100644 --- a/include/linux/sh_intc.h +++ b/include/linux/sh_intc.h @@ -92,7 +92,7 @@ struct intc_desc symbol __initdata = { \ prio_regs, sense_regs, ack_regs), \ } -void __init register_intc_controller(struct intc_desc *desc); +int __init register_intc_controller(struct intc_desc *desc); int intc_set_priority(unsigned int irq, unsigned int prio); int reserve_irq_vector(unsigned int irq); |