aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/kernel/cpu/irq/ipr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/kernel/cpu/irq/ipr.c b/arch/sh/kernel/cpu/irq/ipr.c
index 9282d965a1b6..a4a9906e12d0 100644
--- a/arch/sh/kernel/cpu/irq/ipr.c
+++ b/arch/sh/kernel/cpu/irq/ipr.c
@@ -62,13 +62,13 @@ void register_ipr_controller(struct ipr_desc *desc)
62 62
63 for (i = 0; i < desc->nr_irqs; i++) { 63 for (i = 0; i < desc->nr_irqs; i++) {
64 struct ipr_data *p = desc->ipr_data + i; 64 struct ipr_data *p = desc->ipr_data + i;
65 struct irq_desc *irq_desc; 65 int res;
66 66
67 BUG_ON(p->ipr_idx >= desc->nr_offsets); 67 BUG_ON(p->ipr_idx >= desc->nr_offsets);
68 BUG_ON(!desc->ipr_offsets[p->ipr_idx]); 68 BUG_ON(!desc->ipr_offsets[p->ipr_idx]);
69 69
70 irq_desc = irq_to_desc_alloc_node(p->irq, numa_node_id()); 70 res = irq_alloc_desc_at(p->irq, numa_node_id());
71 if (unlikely(!irq_desc)) { 71 if (unlikely(res != p->irq && res != -EEXIST))
72 printk(KERN_INFO "can not get irq_desc for %d\n", 72 printk(KERN_INFO "can not get irq_desc for %d\n",
73 p->irq); 73 p->irq);
74 continue; 74 continue;