linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/drivers/net/dgrs.c b/drivers/net/dgrs.c
index fa4f094..70b47e4 100644 (file)
--- a/drivers/net/dgrs.c
+++ b/drivers/net/dgrs.c
@@ -993,7 +993,7 @@ dgrs_download(struct net_device *dev0)
        int             is;
        unsigned long   i;
 
-       static const int iv2is[16] = {
+       static int      iv2is[16] = {
                                0, 0, 0, ES4H_IS_INT3,
                                0, ES4H_IS_INT5, 0, ES4H_IS_INT7,
                                0, 0, ES4H_IS_INT10, ES4H_IS_INT11,
@@ -1191,7 +1191,7 @@ dgrs_probe1(struct net_device *dev)
        if (priv->plxreg)
                OUTL(dev->base_addr + PLX_LCL2PCI_DOORBELL, 1);
        
-       rc = request_irq(dev->irq, &dgrs_intr, IRQF_SHARED, "RightSwitch", dev);
+       rc = request_irq(dev->irq, &dgrs_intr, SA_SHIRQ, "RightSwitch", dev);
        if (rc)
                goto err_out;
 
@@ -1551,7 +1551,7 @@ MODULE_PARM_DESC(nicmode, "Digi RightSwitch operating mode (1: switch, 2: multi-
 static int __init dgrs_init_module (void)
 {
        int     i;
-       int     err;
+       int     cardcount = 0;
 
        /*
         *      Command line variable overrides
@@ -1593,13 +1593,13 @@ static int __init dgrs_init_module (void)
         *      Find and configure all the cards
         */
 #ifdef CONFIG_EISA
-       err = eisa_driver_register(&dgrs_eisa_driver);
-       if (err)
-               return err;
+       cardcount = eisa_driver_register(&dgrs_eisa_driver);
+       if (cardcount < 0)
+               return cardcount;
 #endif
-       err = pci_register_driver(&dgrs_pci_driver);
-       if (err)
-               return err;
+       cardcount = pci_register_driver(&dgrs_pci_driver);
+       if (cardcount)
+               return cardcount;
        return 0;
 }