[PATCH] x86: remove superfluous NULL pointer check in destroy_irq()

From: Bartlomiej Zolnierkiewicz
Date: Thu Jul 30 2009 - 17:22:43 EST


From: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
Subject: [PATCH] x86: remove superfluous NULL pointer check in destroy_irq()

This takes care of the following entry from Dan's list:

arch/x86/kernel/apic/io_apic.c +3241 destroy_irq(11) warning: variable derefenced before check 'desc'

Reported-by: Dan Carpenter <error27@xxxxxxxxx>
Cc: corbet@xxxxxxx
Cc: eteo@xxxxxxxxxx
Cc: Julia Lawall <julia@xxxxxxx>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
---
arch/x86/kernel/apic/io_apic.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

Index: b/arch/x86/kernel/apic/io_apic.c
===================================================================
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -3238,8 +3238,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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/