git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
7cb36b6
)
Merge branch 'linus' into irq/genirq
author
Ingo Molnar
<mingo@elte.hu>
Fri, 16 Jan 2009 16:46:22 +0000
(17:46 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Fri, 16 Jan 2009 16:46:22 +0000
(17:46 +0100)
kernel/irq/chip.c
patch
|
blob
|
history
diff --git
a/kernel/irq/chip.c
b/kernel/irq/chip.c
index
f63c706
..
9a7fbb8
100644
(file)
--- a/
kernel/irq/chip.c
+++ b/
kernel/irq/chip.c
@@
-290,7
+290,8
@@
static inline void mask_ack_irq(struct irq_desc *desc, int irq)
desc->chip->mask_ack(irq);
else {
desc->chip->mask(irq);
- desc->chip->ack(irq);
+ if (desc->chip->ack)
+ desc->chip->ack(irq);
}
}
@@
-475,7
+476,8
@@
handle_edge_irq(unsigned int irq, struct irq_desc *desc)
kstat_incr_irqs_this_cpu(irq, desc);
/* Start handling the irq */
- desc->chip->ack(irq);
+ if (desc->chip->ack)
+ desc->chip->ack(irq);
desc = irq_remap_to_desc(irq, desc);
/* Mark the IRQ currently in progress.*/