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

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

diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 9745bf6..b04bf5e 100644 (file)
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -141,6 +141,8 @@
 static char version[] __initdata =
 "cs89x0.c: v2.4.3-pre1 Russell Nelson <nelson@crynwr.com>, Andrew Morton <andrewm@uow.edu.au>\n";
 
+#define DRV_NAME "cs89x0"
+
 /* First, a few definitions that the brave might change.
    A zero-terminated list of I/O addresses to be probed. Some special flags..
       Addr & 1 = Read back the address port, look for signature and reset
@@ -261,7 +263,6 @@ static int __init media_fn(char *str)
 }
 
 __setup("cs89x0_media=", media_fn);
-#endif
 
 \f
 /* Check for a network adaptor of this type, and return '0' iff one exists.
@@ -318,6 +319,7 @@ out:
        printk(KERN_WARNING "cs89x0: no cs8900 or cs8920 detected.  Be sure to disable PnP with SETUP\n");
        return ERR_PTR(err);
 }
+#endif
 
 static int
 readreg(struct net_device *dev, int portno)
@@ -425,9 +427,9 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
 
        /* Grab the region so we can find another board if autoIRQ fails. */
        /* WTF is going on here? */
-       if (!request_region(ioaddr & ~3, NETCARD_IO_EXTENT, dev->name)) {
+       if (!request_region(ioaddr & ~3, NETCARD_IO_EXTENT, DRV_NAME)) {
                printk(KERN_ERR "%s: request_region(0x%x, 0x%x) failed\n",
-                               dev->name, ioaddr, NETCARD_IO_EXTENT);
+                               DRV_NAME, ioaddr, NETCARD_IO_EXTENT);
                retval = -EBUSY;
                goto out1;
        }
@@ -1564,7 +1566,7 @@ static void release_dma_buff(struct net_local *lp)
 {
        if (lp->dma_buff) {
                free_pages((unsigned long)(lp->dma_buff), get_order(lp->dmasize * 1024));
-               lp->dma_buff = 0;
+               lp->dma_buff = NULL;
        }
 }
 #endif