Messages in this thread Patch in this message | | | Date | Sun, 2 Aug 2009 19:41:08 GMT | From | tip-bot for Bartlomiej Zolnierkiewicz <> | Subject | [tip:x86/apic] x86: Remove superfluous NULL pointer check in destroy_irq() |
| |
Commit-ID: 25f6e89bedd29cc49bfa0d55497e91a671b9ae6e Gitweb: http://git.kernel.org/tip/25f6e89bedd29cc49bfa0d55497e91a671b9ae6e Author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> AuthorDate: Thu, 30 Jul 2009 23:21:18 +0200 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Sun, 2 Aug 2009 21:37:00 +0200
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>
--- 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 cf51b0b..7e92a92 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) 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);
| |