From: davej@codemonkey.org.uk
To: jgarzik@pobox.com
Cc: linux-kernel@vger.kernel.org
Subject: misc au1000 cleanups.
Date: Mon, 24 Mar 2003 16:41:48 +0000 [thread overview]
Message-ID: <200303241642.h2OGg035008226@deviant.impure.org.uk> (raw)
- Missing release region
- Unneeded initialisation of private struct
(already done in init_etherdev)
- Remove unneeded freeing of dev->priv
(auto-free'd by kfree(dev)
- actually kfree (dev), plugging leak.
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/net/au1000_eth.c linux-2.5/drivers/net/au1000_eth.c
--- bk-linus/drivers/net/au1000_eth.c 2003-03-08 09:57:14.000000000 +0000
+++ linux-2.5/drivers/net/au1000_eth.c 2003-02-20 12:16:32.000000000 +0000
@@ -675,37 +675,24 @@ au1000_probe1(struct net_device *dev, lo
char *pmac, *argptr;
char ethaddr[6];
- if (!request_region(ioaddr, MAC_IOSIZE, "Au1000 ENET")) {
+ if (!request_region(ioaddr, MAC_IOSIZE, "Au1000 ENET"))
return -ENODEV;
- }
if (version_printed++ == 0) printk(version);
- if (!dev) {
+ if (!dev)
dev = init_etherdev(0, sizeof(struct au1000_private));
- }
+
if (!dev) {
- printk (KERN_ERR "au1000 eth: init_etherdev failed\n");
- return -ENODEV;
+ printk (KERN_ERR "au1000 eth: init_etherdev failed\n");
+ release_region(ioaddr, MAC_IOSIZE);
+ return -ENODEV;
}
printk("%s: Au1xxx ethernet found at 0x%lx, irq %d\n",
dev->name, ioaddr, irq);
- /* Initialize our private structure */
- if (dev->priv == NULL) {
- aup = (struct au1000_private *)
- kmalloc(sizeof(*aup), GFP_KERNEL);
- if (aup == NULL) {
- retval = -ENOMEM;
- goto free_region;
- }
- dev->priv = aup;
- }
-
aup = dev->priv;
- memset(aup, 0, sizeof(*aup));
-
/* Allocate the data buffers */
aup->vaddr = (u32)dma_alloc(MAX_BUF_SIZE *
@@ -834,8 +821,6 @@ free_region:
if (aup->vaddr)
dma_free((void *)aup->vaddr,
MAX_BUF_SIZE * (NUM_TX_BUFFS+NUM_RX_BUFFS));
- if (dev->priv != NULL)
- kfree(dev->priv);
printk(KERN_ERR "%s: au1000_probe1 failed. Returns %d\n",
dev->name, retval);
kfree(dev);
@@ -1003,15 +988,15 @@ static int au1000_close(struct net_devic
spin_lock_irqsave(&aup->lock, flags);
/* stop the device */
- if (netif_device_present(dev)) {
+ if (netif_device_present(dev))
netif_stop_queue(dev);
- }
/* disable the interrupt */
free_irq(dev->irq, dev);
spin_unlock_irqrestore(&aup->lock, flags);
reset_mac(dev);
+ kfree(dev);
MOD_DEC_USE_COUNT;
return 0;
}
next reply other threads:[~2003-03-24 16:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-03-24 16:41 davej [this message]
2003-03-29 5:26 ` misc au1000 cleanups Jeff Garzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200303241642.h2OGg035008226@deviant.impure.org.uk \
--to=davej@codemonkey.org.uk \
--cc=jgarzik@pobox.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox