patch-2.4.12 linux/drivers/net/macsonic.c

• Lines: 34
• Date: Wed Oct 10 23:23:24 2001
• Orig file: v2.4.11/linux/drivers/net/macsonic.c
• Orig date: Sun Sep 23 11:40:58 2001

diff -u --recursive --new-file v2.4.11/linux/drivers/net/macsonic.c linux/drivers/net/macsonic.c
@@ -168,6 +168,8 @@
 	if ((lp->rba = (char *)
 	     kmalloc(SONIC_NUM_RRS * SONIC_RBSIZE, GFP_KERNEL | GFP_DMA)) == NULL) {
 		printk(KERN_ERR "%s: couldn't allocate receive buffers\n", dev->name);
+		kfree(lp->sonic_desc);
+		lp->sonic_desc = NULL;
 		return -ENOMEM;
 	}
 
@@ -322,7 +324,7 @@
 		/* methinks this will always be true but better safe than sorry */
 		if (dev->priv == NULL) {
 			dev->priv = kmalloc(sizeof(struct sonic_local), GFP_KERNEL);
-			if (!dev->priv) /* FIXME: kfree dev if necessary */
+			if (!dev->priv)
 				return -ENOMEM;
 		}
 	} else {
@@ -518,9 +520,14 @@
 
 	if (dev) {
 		dev = init_etherdev(dev, sizeof(struct sonic_local));
+		if (!dev)
+			return -ENOMEM;
 		/* methinks this will always be true but better safe than sorry */
-		if (dev->priv == NULL)
+		if (dev->priv == NULL) {
 			dev->priv = kmalloc(sizeof(struct sonic_local), GFP_KERNEL);
+			if (!dev->priv) /* FIXME: kfree dev if necessary */
+				return -ENOMEM;
+		}
 	} else {
 		dev = init_etherdev(NULL, sizeof(struct sonic_local));
 	}