VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / net / lp486e.c

diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c
index 7dda5dd..c87d90a 100644 (file)
--- a/drivers/net/lp486e.c
+++ b/drivers/net/lp486e.c
@@ -75,6 +75,8 @@ All other communication is through memory!
 #include <asm/io.h>
 #include <asm/dma.h>
 
+#define DRV_NAME "lp486e"
+
 /* debug print flags */
 #define LOG_SRCDST    0x80000000
 #define LOG_STATINT   0x40000000
@@ -477,7 +479,7 @@ remove_rx_bufs(struct net_device *dev) {
                kfree(rfd);
        } while (rfd != lp->rx_tail);
 
-       lp->rx_tail = 0;
+       lp->rx_tail = NULL;
 
 #if 0
        for (lp->rbd_list) {
@@ -970,7 +972,7 @@ int __init lp486e_probe(struct net_device *dev) {
                return -ENODEV;
        probed++;
 
-       if (!request_region(IOADDR, LP486E_TOTAL_SIZE, dev->name)) {
+       if (!request_region(IOADDR, LP486E_TOTAL_SIZE, DRV_NAME)) {
                printk(KERN_ERR "lp486e: IO address 0x%x in use\n", IOADDR);
                return -EBUSY;
        }