linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / net / tokenring / madgemc.c

diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
index 666bbaa..3a25d19 100644 (file)
--- a/drivers/net/tokenring/madgemc.c
+++ b/drivers/net/tokenring/madgemc.c
@@ -311,7 +311,7 @@ static int __devinit madgemc_probe(struct device *device)
         */ 
        outb(0, dev->base_addr + MC_CONTROL_REG0); /* sanity */
        madgemc_setsifsel(dev, 1);
-       if (request_irq(dev->irq, madgemc_interrupt, IRQF_SHARED,
+       if (request_irq(dev->irq, madgemc_interrupt, SA_SHIRQ,
                       "madgemc", dev)) {
                ret = -EBUSY;
                goto getout3;
@@ -735,7 +735,8 @@ static int __devexit madgemc_remove(struct device *device)
        struct net_local *tp;
         struct card_info *card;
 
-       BUG_ON(!dev);
+       if (!dev)
+               BUG();
 
        tp = dev->priv;
        card = tp->tmspriv;