From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Cc: Linux Kernel Development <linux-kernel@vger.kernel.org>,
linux-net@vger.kernel.org,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH 155] Mac Sonic Ethernet
Date: Sun, 20 Jun 2004 19:20:51 +0200 [thread overview]
Message-ID: <200406201720.i5KHKpne001344@anakin.of.borg> (raw)
Mac Sonic Ethernet updates (from Matthias Urlichs in 2.6):
- Fix memory leak in error path
- Kill obsolete namespace stuff
- Kill duplicate `MODULE_LICENSE("GPL");' (already defined in included
sonic.c) which causes a compile failure
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
--- linux-2.4.27-rc1/drivers/net/macsonic.c 2004-04-27 17:20:37.000000000 +0200
+++ linux-m68k-2.4.27-rc1/drivers/net/macsonic.c 2004-05-04 22:38:58.000000000 +0200
@@ -199,6 +199,7 @@ int __init macsonic_init(struct net_devi
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);
return -ENOMEM;
}
@@ -635,19 +636,14 @@ int __init mac_nubus_sonic_probe(struct
}
#ifdef MODULE
-static char namespace[16] = "";
static struct net_device dev_macsonic;
MODULE_PARM(sonic_debug, "i");
MODULE_PARM_DESC(sonic_debug, "macsonic debug level (1-4)");
-MODULE_LICENSE("GPL");
-
-EXPORT_NO_SYMBOLS;
int
init_module(void)
{
- dev_macsonic.name = namespace;
dev_macsonic.init = macsonic_probe;
if (register_netdev(&dev_macsonic) != 0) {
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
next reply other threads:[~2004-06-20 17:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-06-20 17:20 Geert Uytterhoeven [this message]
2004-06-20 18:32 ` 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=200406201720.i5KHKpne001344@anakin.of.borg \
--to=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-net@vger.kernel.org \
--cc=marcelo.tosatti@cyclades.com \
/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
all inboxes | Powered by JetHome®