---

yaml --- r: 234707 b: refs/heads/master c: 3b56f05 h: refs/heads/master i: 234705: 14a6ba4 234703: 5e6c294 v: v3
git-mirror · Feb 19, 2011 · c0663f4 · c0663f4
1 parent 5abf943
commit c0663f4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1535dfacbf21c4da1b73fcf07c39913da5bd5581
+refs/heads/master: 3b56f0585fd4c02d047dc406668cb40159b2d340
diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
@@ -1057,10 +1057,7 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id)
 	/* If this was the last handler, shut down the IRQ line: */
 	if (!desc->action) {
 		desc->status |= IRQ_DISABLED;
-		if (desc->irq_data.chip->irq_shutdown)
-			desc->irq_data.chip->irq_shutdown(&desc->irq_data);
-		else
-			desc->irq_data.chip->irq_disable(&desc->irq_data);
+		desc->irq_data.chip->irq_shutdown(&desc->irq_data);
 	}
 
 #ifdef CONFIG_SMP