diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-07-30 17:21:18 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-08-02 15:37:00 -0400 |
commit | 25f6e89bedd29cc49bfa0d55497e91a671b9ae6e (patch) | |
tree | b8fe69d00029a7bbd963b331950f4270f3a03cad /arch/x86/kernel/apic | |
parent | e25371d60cb06a44d7a32d7966ab9bfbeacb9390 (diff) |
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@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Eugene Teo <eteo@redhat.com>
Cc: Julia Lawall <julia@diku.dk>
LKML-Reference: <200907302321.19086.bzolnier@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic')
-rw-r--r-- | arch/x86/kernel/apic/io_apic.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index cf51b0b58c56..7e92a9212fd7 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c | |||
@@ -3185,8 +3185,7 @@ void destroy_irq(unsigned int irq) | |||
3185 | cfg = desc->chip_data; | 3185 | cfg = desc->chip_data; |
3186 | dynamic_irq_cleanup(irq); | 3186 | dynamic_irq_cleanup(irq); |
3187 | /* connect back irq_cfg */ | 3187 | /* connect back irq_cfg */ |
3188 | if (desc) | 3188 | desc->chip_data = cfg; |
3189 | desc->chip_data = cfg; | ||
3190 | 3189 | ||
3191 | free_irte(irq); | 3190 | free_irte(irq); |
3192 | spin_lock_irqsave(&vector_lock, flags); | 3191 | spin_lock_irqsave(&vector_lock, flags); |