---

yaml --- r: 158177 b: refs/heads/master c: c36ba80 h: refs/heads/master i: 158175: 77c8a5f v: v3
git-mirror · Aug 9, 2009 · e9a1dd2 · e9a1dd2
1 parent 6fddd76
commit e9a1dd2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 990a55eb25d9698d61352264cc43f3a9c04cce90
+refs/heads/master: c36ba80ea01d0aecb652c26799a912e760ce8981
diff --git a/trunk/kernel/irq/resend.c b/trunk/kernel/irq/resend.c
@@ -70,8 +70,7 @@ void check_irq_resend(struct irq_desc *desc, unsigned int irq)
 	if ((status & (IRQ_LEVEL | IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
 		desc->status = (status & ~IRQ_PENDING) | IRQ_REPLAY;
 
-		if (!desc->chip || !desc->chip->retrigger ||
-					!desc->chip->retrigger(irq)) {
+		if (!desc->chip->retrigger || !desc->chip->retrigger(irq)) {
 #ifdef CONFIG_HARDIRQS_SW_RESEND
 			/* Set it pending and activate the softirq: */
 			set_bit(irq, irqs_resend);