patch-2.4.0-test11 linux/drivers/net/am79c961a.c

• Lines: 38
• Date: Thu Nov 16 12:51:28 2000
• Orig file: v2.4.0-test10/linux/drivers/net/am79c961a.c
• Orig date: Sun Oct 8 10:50:19 2000

diff -u --recursive --new-file v2.4.0-test10/linux/drivers/net/am79c961a.c linux/drivers/net/am79c961a.c
@@ -285,15 +285,13 @@
 am79c961_open(struct net_device *dev)
 {
 	struct dev_priv *priv = (struct dev_priv *)dev->priv;
-
-	MOD_INC_USE_COUNT;
+	int ret;
 
 	memset (&priv->stats, 0, sizeof (priv->stats));
 
-	if (request_irq(dev->irq, am79c961_interrupt, 0, "am79c961", dev)) {
-		MOD_DEC_USE_COUNT;
-		return -EAGAIN;
-	}
+	ret = request_irq(dev->irq, am79c961_interrupt, 0, dev->name, dev);
+	if (ret)
+		return ret;
 
 	am79c961_init_for_open(dev);
 
@@ -320,7 +318,6 @@
 
 	free_irq (dev->irq, dev);
 
-	MOD_DEC_USE_COUNT;
 	return 0;
 }
 
@@ -657,7 +654,8 @@
 	if (!dev)
 		goto out;
 
-	priv = (struct dev_priv *) dev->priv;
+	SET_MODULE_OWNER(dev);
+	priv = dev->priv;
 
 	/*
 	 * Fixed address and IRQ lines here.