---

yaml --- r: 158630 b: refs/heads/master c: 25f6e89 h: refs/heads/master v: v3
git-mirror · Aug 2, 2009 · c3f728a · c3f728a
1 parent 78eb9a0
commit c3f728a
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: e25371d60cb06a44d7a32d7966ab9bfbeacb9390
+refs/heads/master: 25f6e89bedd29cc49bfa0d55497e91a671b9ae6e
diff --git a/trunk/arch/x86/kernel/apic/io_apic.c b/trunk/arch/x86/kernel/apic/io_apic.c
@@ -3185,8 +3185,7 @@ void destroy_irq(unsigned int irq)
 	cfg = desc->chip_data;
 	dynamic_irq_cleanup(irq);
 	/* connect back irq_cfg */
-	if (desc)
-		desc->chip_data = cfg;
+	desc->chip_data = cfg;
 
 	free_irte(irq);
 	spin_lock_irqsave(&vector_lock, flags);