From c3f728ad68579728c8cfce6e45eab13bf9736e7b Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Thu, 30 Jul 2009 23:21:18 +0200
Subject: [PATCH] --- yaml --- r: 158630 b: refs/heads/master c:
 25f6e89bedd29cc49bfa0d55497e91a671b9ae6e h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/x86/kernel/apic/io_apic.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4c1c61dfc19a..496e4f1b7088 100644
--- 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
index cf51b0b58c56..7e92a9212fd7 100644
--- 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);