summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-10-05 18:13:23 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-10-05 18:13:23 +0900
commitd74310d3b18aabbb7d0549ea9e3fd3259c1dce00 (patch)
treed31d696a25aa22e8f2490edf287fe28c3a3b98d5 /include
parentc1e30ad98fe210688edca872686db4a715c2fb23 (diff)
downloadlinux-stable-d74310d3b18aabbb7d0549ea9e3fd3259c1dce00.tar.gz
linux-stable-d74310d3b18aabbb7d0549ea9e3fd3259c1dce00.tar.bz2
linux-stable-d74310d3b18aabbb7d0549ea9e3fd3259c1dce00.zip
sh: intc: Handle early lookups of subgroup IRQs.
If lookups happen while the radix node still points to a subgroup mapping, an IRQ hasn't yet been made available for the specified id, so error out accordingly. Once the slot is replaced with an IRQ mapping and the tag is discarded, lookup can commence as normal. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/sh_intc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sh_intc.h b/include/linux/sh_intc.h
index 04134a6c7b52..1fc69701e0f8 100644
--- a/include/linux/sh_intc.h
+++ b/include/linux/sh_intc.h
@@ -117,7 +117,7 @@ struct intc_desc symbol __initdata = { \
int __init register_intc_controller(struct intc_desc *desc);
void reserve_intc_vectors(struct intc_vect *vectors, unsigned int nr_vecs);
int intc_set_priority(unsigned int irq, unsigned int prio);
-unsigned int intc_irq_lookup(const char *chipname, intc_enum enum_id);
+int intc_irq_lookup(const char *chipname, intc_enum enum_id);
void intc_finalize(void);
#ifdef CONFIG_INTC_USERIMASK