Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 321672
b: refs/heads/master
c: 1026023
h: refs/heads/master
v: v3
  • Loading branch information
Paul Mundt committed Aug 9, 2012
1 parent 5003416 commit 7ffaa5a
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 800fb3ddee2c50918d651fbd70515f1e38857305
refs/heads/master: 1026023705b0baa2b37df2a0d1da0022fc7b985e
27 changes: 23 additions & 4 deletions trunk/drivers/sh/intc/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,16 @@ int __init register_intc_controller(struct intc_desc *desc)

res = irq_create_identity_mapping(d->domain, irq);
if (unlikely(res)) {
pr_err("can't get irq_desc for %d\n", irq);
continue;
if (res == -EEXIST) {
res = irq_domain_associate(d->domain, irq, irq);
if (unlikely(res)) {
pr_err("domain association failure\n");
continue;
}
} else {
pr_err("can't identity map IRQ %d\n", irq);
continue;
}
}

intc_irq_xlate_set(irq, vect->enum_id, d);
Expand All @@ -345,8 +353,19 @@ int __init register_intc_controller(struct intc_desc *desc)
*/
res = irq_create_identity_mapping(d->domain, irq2);
if (unlikely(res)) {
pr_err("can't get irq_desc for %d\n", irq2);
continue;
if (res == -EEXIST) {
res = irq_domain_associate(d->domain,
irq, irq);
if (unlikely(res)) {
pr_err("domain association "
"failure\n");
continue;
}
} else {
pr_err("can't identity map IRQ %d\n",
irq);
continue;
}
}

vect2->enum_id = 0;
Expand Down

0 comments on commit 7ffaa5a

Please sign in to comment.