Merge branch 'for-35' of git://repo.or.cz/linux-kbuild

[karo-tx-linux.git] / drivers / net / 3c507.c

diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c
index c4e272fbc2cc83d315d0a1c84f01816f7249c4b8..ea9b7a098c9bd75e2023fe7e5164f4baf7a86fee 100644 (file)
--- a/drivers/net/3c507.c
+++ b/drivers/net/3c507.c
@@ -551,8 +551,7 @@ static irqreturn_t el16_interrupt(int irq, void *dev_id)
        void __iomem *shmem;
 
        if (dev == NULL) {
-               pr_err("%s: net_interrupt(): irq %d for unknown device.\n",
-                       dev->name, irq);
+               pr_err("net_interrupt(): irq %d for unknown device.\n", irq);
                return IRQ_NONE;
        }
 
@@ -764,7 +763,6 @@ static void init_82586_mem(struct net_device *dev)
        if (net_debug > 4)
                pr_debug("%s: Initialized 82586, status %04x.\n", dev->name,
                           readw(shmem+iSCB_STATUS));
-       return;
 }
 
 static void hardware_send_packet(struct net_device *dev, void *buf, short length, short pad)