---

yaml --- r: 116381 b: refs/heads/master c: 7e6e178 h: refs/heads/master i: 116379: 9ce7ee8 v: v3
git-mirror · Sep 6, 2008 · cffbf04 · cffbf04
1 parent 4aa408a
commit cffbf04
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 377bf1e4ac2d894791733270604594c7c851ef83
+refs/heads/master: 7e6e178ab1548c8d894a77593e757acf4510b8ba
diff --git a/trunk/kernel/irq/chip.c b/trunk/kernel/irq/chip.c
@@ -587,7 +587,7 @@ __set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained,
 		desc->status &= ~IRQ_DISABLED;
 		desc->status |= IRQ_NOREQUEST | IRQ_NOPROBE;
 		desc->depth = 0;
-		desc->chip->unmask(irq);
+		desc->chip->startup(irq);
 	}
 	spin_unlock_irqrestore(&desc->lock, flags);
 }

diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
@@ -397,10 +397,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)
 		if (!(desc->status & IRQ_NOAUTOEN)) {
 			desc->depth = 0;
 			desc->status &= ~IRQ_DISABLED;
-			if (desc->chip->startup)
-				desc->chip->startup(irq);
-			else
-				desc->chip->enable(irq);
+			desc->chip->startup(irq);
 		} else
 			/* Undo nested disables: */
 			desc->depth = 1;