From 293478d66811a807ad7d02ec32cbfc23a3e2722e Mon Sep 17 00:00:00 2001 From: Francois Romieu Date: Mon, 12 May 2008 18:44:21 +0200 Subject: [PATCH] --- yaml --- r: 97361 b: refs/heads/master c: d04455fba3777fa5c3963348be76510169bbf4df h: refs/heads/master i: 97359: fd949622516f4b8ed8fa1f8e521b48ba5520bf69 v: v3 --- [refs] | 2 +- trunk/drivers/net/au1000_eth.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 609d30c4145e..514bd313b3d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94a47f4161798c34bec7718768f72cf16bcfb4f0 +refs/heads/master: d04455fba3777fa5c3963348be76510169bbf4df diff --git a/trunk/drivers/net/au1000_eth.c b/trunk/drivers/net/au1000_eth.c index 3634b5fd7919..7023d77bf380 100644 --- a/trunk/drivers/net/au1000_eth.c +++ b/trunk/drivers/net/au1000_eth.c @@ -1239,12 +1239,7 @@ static int au1000_rx(struct net_device *dev) */ static irqreturn_t au1000_interrupt(int irq, void *dev_id) { - struct net_device *dev = (struct net_device *) dev_id; - - if (dev == NULL) { - printk(KERN_ERR "%s: isr: null dev ptr\n", dev->name); - return IRQ_RETVAL(1); - } + struct net_device *dev = dev_id; /* Handle RX interrupts first to minimize chance of overrun */