aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Gruber <micah.gruber@gmail.com>2007-09-28 22:42:11 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 16:53:53 -0700
commit1f8f4559f8c5829348a010a9e0bbb423310060d1 (patch)
tree2f1ec7d0febddda537062a3a914bcacadce32aed
parent13f7b8c011cd8d16ad3063409b9d969466c9e2f4 (diff)
Fix a potential NULL pointer dereference in uli526x_interrupt() in drivers/net/tulip/uli526x.c
This patch fixes an apparent potential null dereference bug where we dereference dev before a null check. This patch simply remvoes the can't-happen test for a null pointer. Signed-off-by: Micah Gruber <micah.gruber@gmail.com> Cc: Grant Grundler <grundler@parisc-linux.org> Acked-by: Jeff Garzik <jeff@garzik.org> Acked-by: Kyle McMartin <kyle@mcmartin.ca> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/tulip/uli526x.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index e64bde46822..76e55612430 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -664,11 +664,6 @@ static irqreturn_t uli526x_interrupt(int irq, void *dev_id)
unsigned long ioaddr = dev->base_addr;
unsigned long flags;
- if (!dev) {
- ULI526X_DBUG(1, "uli526x_interrupt() without DEVICE arg", 0);
- return IRQ_NONE;
- }
-
spin_lock_irqsave(&db->lock, flags);
outl(0, ioaddr + DCR7);