patch-2.4.0-test12 linux/drivers/net/sis900.c

• Lines: 41
• Date: Mon Dec 11 13:38:29 2000
• Orig file: v2.4.0-test11/linux/drivers/net/sis900.c
• Orig date: Sun Nov 19 18:44:11 2000

diff -u --recursive --new-file v2.4.0-test11/linux/drivers/net/sis900.c linux/drivers/net/sis900.c
@@ -241,6 +241,7 @@
 	net_dev = init_etherdev(NULL, sizeof(struct sis900_private));
 	if (!net_dev)
 		return -ENOMEM;
+	SET_MODULE_OWNER(net_dev);
 
 	if (!request_region(ioaddr, SIS900_TOTAL_SIZE, net_dev->name)) {
 		printk(KERN_ERR "sis900.c: can't allocate I/O space at 0x%lX\n", ioaddr);
@@ -530,8 +531,7 @@
 	struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv;
 	long ioaddr = net_dev->base_addr;
 	u8  revision;
-
-	MOD_INC_USE_COUNT;
+	int ret;
 
 	/* Soft reset the chip. */
 	sis900_reset(net_dev);
@@ -541,10 +541,9 @@
 	if (revision == SIS630E_REV || revision == SIS630EA1_REV)
 		sis630e_set_eq(net_dev);
 
-	if (request_irq(net_dev->irq, &sis900_interrupt, SA_SHIRQ, net_dev->name, net_dev)) {
-		MOD_DEC_USE_COUNT;
-		return -EAGAIN;
-	}
+	ret = request_irq(net_dev->irq, &sis900_interrupt, SA_SHIRQ, net_dev->name, net_dev);
+	if (ret)
+		return ret;
 
 	sis900_init_rxfilter(net_dev);
 
@@ -1278,8 +1277,6 @@
 	}
 
 	/* Green! Put the chip in low-power mode. */
-
-	MOD_DEC_USE_COUNT;
 
 	return 0;
 }