From fe22bdf10df7ff2cccebfcdd4ea386b0feb26369 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jesper.juhl@gmail.com>
Date: Fri, 28 Sep 2007 22:42:09 -0700
Subject: [PATCH] --- yaml --- r: 66847 b: refs/heads/master c:
 bcfef8c3681fa59b653871682956a8fdf5c27c5a h: refs/heads/master i:   66845:
 89ffe90776f1903c11d96c4e0fd2d6d91e9165f7   66843:
 b801084a176006f3a7af7f1a9eac4e6cd14579ad   66839:
 c253a5dcbefb84482cb30f86ae01716a8b2237a6   66831:
 76cde67e7ee89530b5c631657ea5baf453a22e5a   66815:
 df0a3b014cd09c31a05638722b9a887475e2ec96 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/net/tokenring/3c359.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 7b6b7ea325d0..1d24a4e91cac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0da18e3883d18ac716ad8cc07df9bd30933807ac
+refs/heads/master: bcfef8c3681fa59b653871682956a8fdf5c27c5a
diff --git a/trunk/drivers/net/tokenring/3c359.c b/trunk/drivers/net/tokenring/3c359.c
index 88d03c085d54..7224d368b2a7 100644
--- a/trunk/drivers/net/tokenring/3c359.c
+++ b/trunk/drivers/net/tokenring/3c359.c
@@ -1045,11 +1045,6 @@ static irqreturn_t xl_interrupt(int irq, void *dev_id)
 	u8 __iomem * xl_mmio = xl_priv->xl_mmio ; 
 	u16 intstatus, macstatus  ;
 
-	if (!dev) { 
-		printk(KERN_WARNING "Device structure dead, aaahhhh !\n") ;
-		return IRQ_NONE; 
-	}
-
 	intstatus = readw(xl_mmio + MMIO_INTSTATUS) ;  
 
 	if (!(intstatus & 1)) /* We didn't generate the interrupt */