Commit f7db478b authored by Stephen Hemminger's avatar Stephen Hemminger

[PATCH] (28/42) ultra32

NE52-ultra32
	* switched smc-ultra32 to dynamic allocation
	* smc-ultra32: fixed order of freeing bugs
	* smc-ultra32: fixed clobbering on autoprobe
	* smc-ultra32: fixed resource leaks on failure exits
parent 3c833f20
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
extern struct net_device *ne2_probe(int unit); extern struct net_device *ne2_probe(int unit);
extern struct net_device *hp100_probe(int unit); extern struct net_device *hp100_probe(int unit);
extern struct net_device *ultra_probe(int unit); extern struct net_device *ultra_probe(int unit);
extern int ultra32_probe(struct net_device *dev); extern struct net_device *ultra32_probe(int unit);
extern struct net_device *wd_probe(int unit); extern struct net_device *wd_probe(int unit);
extern struct net_device *el2_probe(int unit); extern struct net_device *el2_probe(int unit);
extern struct net_device *ne_probe(int unit); extern struct net_device *ne_probe(int unit);
...@@ -160,14 +160,11 @@ static int __init probe_list2(int unit, struct devprobe2 *p, int autoprobe) ...@@ -160,14 +160,11 @@ static int __init probe_list2(int unit, struct devprobe2 *p, int autoprobe)
* drivers that probe for EISA cards (in the ISA group). These are the * drivers that probe for EISA cards (in the ISA group). These are the
* legacy EISA only driver probes, and also the legacy PCI probes * legacy EISA only driver probes, and also the legacy PCI probes
*/ */
static struct devprobe eisa_probes[] __initdata = {
static struct devprobe2 eisa_probes[] __initdata = {
#ifdef CONFIG_ULTRA32 #ifdef CONFIG_ULTRA32
{ultra32_probe, 0}, {ultra32_probe, 0},
#endif #endif
{NULL, 0},
};
static struct devprobe2 eisa_probes2[] __initdata = {
#ifdef CONFIG_AC3200 #ifdef CONFIG_AC3200
{ac3200_probe, 0}, {ac3200_probe, 0},
#endif #endif
...@@ -379,8 +376,7 @@ static int __init ethif_probe(int unit) ...@@ -379,8 +376,7 @@ static int __init ethif_probe(int unit)
* will be probed before other ISA/EISA/MCA/PCI bus cards. * will be probed before other ISA/EISA/MCA/PCI bus cards.
*/ */
if (probe_list(dev, m68k_probes) == 0 || if (probe_list(dev, m68k_probes) == 0 ||
probe_list(dev, mips_probes) == 0 || probe_list(dev, mips_probes) == 0)
probe_list(dev, eisa_probes) == 0)
err = register_netdev(dev); err = register_netdev(dev);
if (err) if (err)
...@@ -396,7 +392,7 @@ static void __init ethif_probe2(int unit) ...@@ -396,7 +392,7 @@ static void __init ethif_probe2(int unit)
if (base_addr == 1) if (base_addr == 1)
return; return;
probe_list2(unit, eisa_probes2, base_addr == 0) && probe_list2(unit, eisa_probes, base_addr == 0) &&
probe_list2(unit, mca_probes, base_addr == 0) && probe_list2(unit, mca_probes, base_addr == 0) &&
probe_list2(unit, isa_probes, base_addr == 0) && probe_list2(unit, isa_probes, base_addr == 0) &&
probe_list2(unit, parport_probes, base_addr == 0); probe_list2(unit, parport_probes, base_addr == 0);
......
...@@ -61,7 +61,6 @@ static const char *version = "smc-ultra32.c: 06/97 v1.00\n"; ...@@ -61,7 +61,6 @@ static const char *version = "smc-ultra32.c: 06/97 v1.00\n";
#include "8390.h" #include "8390.h"
int ultra32_probe(struct net_device *dev);
static int ultra32_probe1(struct net_device *dev, int ioaddr); static int ultra32_probe1(struct net_device *dev, int ioaddr);
static int ultra32_open(struct net_device *dev); static int ultra32_open(struct net_device *dev);
static void ultra32_reset_8390(struct net_device *dev); static void ultra32_reset_8390(struct net_device *dev);
...@@ -98,26 +97,60 @@ static int ultra32_close(struct net_device *dev); ...@@ -98,26 +97,60 @@ static int ultra32_close(struct net_device *dev);
#define ULTRA32_CFG6 (-0x15) /* 0xc8b */ #define ULTRA32_CFG6 (-0x15) /* 0xc8b */
#define ULTRA32_CFG7 0x0d /* 0xcad */ #define ULTRA32_CFG7 0x0d /* 0xcad */
static void cleanup_card(struct net_device *dev)
{
int ioaddr = dev->base_addr - ULTRA32_NIC_OFFSET;
/* NB: ultra32_close_card() does free_irq */
release_region(ioaddr, ULTRA32_IO_EXTENT);
kfree(dev->priv);
}
/* Probe for the Ultra32. This looks like a 8013 with the station /* Probe for the Ultra32. This looks like a 8013 with the station
address PROM at I/O ports <base>+8 to <base>+13, with a checksum address PROM at I/O ports <base>+8 to <base>+13, with a checksum
following. following.
*/ */
int __init ultra32_probe(struct net_device *dev) struct net_device * __init ultra32_probe(int unit)
{ {
int ioaddr; struct net_device *dev;
int base;
int irq;
int err = -ENODEV;
if (!EISA_bus)
return ERR_PTR(-ENODEV);
if (!EISA_bus) return -ENODEV; dev = alloc_etherdev(0);
if (!dev)
return ERR_PTR(-ENOMEM);
if (unit >= 0) {
sprintf(dev->name, "eth%d", unit);
netdev_boot_setup_check(dev);
}
SET_MODULE_OWNER(dev); SET_MODULE_OWNER(dev);
/* EISA spec allows for up to 16 slots, but 8 is typical. */ irq = dev->irq;
for (ioaddr = 0x1000 + ULTRA32_BASE; ioaddr < 0x9000; ioaddr += 0x1000)
if (ultra32_probe1(dev, ioaddr) == 0)
return 0;
return -ENODEV; /* EISA spec allows for up to 16 slots, but 8 is typical. */
for (base = 0x1000 + ULTRA32_BASE; base < 0x9000; base += 0x1000) {
if (ultra32_probe1(dev, base) == 0)
break;
dev->irq = irq;
}
if (base >= 0x9000)
goto out;
err = register_netdev(dev);
if (err)
goto out1;
return dev;
out1:
cleanup_card(dev);
out:
free_netdev(dev);
return ERR_PTR(err);
} }
static int __init ultra32_probe1(struct net_device *dev, int ioaddr) static int __init ultra32_probe1(struct net_device *dev, int ioaddr)
...@@ -380,7 +413,7 @@ static void ultra32_block_output(struct net_device *dev, ...@@ -380,7 +413,7 @@ static void ultra32_block_output(struct net_device *dev,
#ifdef MODULE #ifdef MODULE
#define MAX_ULTRA32_CARDS 4 /* Max number of Ultra cards per module */ #define MAX_ULTRA32_CARDS 4 /* Max number of Ultra cards per module */
static struct net_device dev_ultra[MAX_ULTRA32_CARDS]; static struct net_device *dev_ultra[MAX_ULTRA32_CARDS];
MODULE_DESCRIPTION("SMC Ultra32 EISA ethernet driver"); MODULE_DESCRIPTION("SMC Ultra32 EISA ethernet driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -390,18 +423,15 @@ int init_module(void) ...@@ -390,18 +423,15 @@ int init_module(void)
int this_dev, found = 0; int this_dev, found = 0;
for (this_dev = 0; this_dev < MAX_ULTRA32_CARDS; this_dev++) { for (this_dev = 0; this_dev < MAX_ULTRA32_CARDS; this_dev++) {
struct net_device *dev = &dev_ultra[this_dev]; struct net_device *dev = ultra32_probe(-1);
dev->init = ultra32_probe; if (IS_ERR(dev))
if (register_netdev(dev) != 0) { break;
if (found > 0) { /* Got at least one. */ dev_ultra[found++] = dev;
return 0;
} }
if (found)
return 0;
printk(KERN_WARNING "smc-ultra32.c: No SMC Ultra32 found.\n"); printk(KERN_WARNING "smc-ultra32.c: No SMC Ultra32 found.\n");
return -ENXIO; return -ENXIO;
}
found++;
}
return 0;
} }
void cleanup_module(void) void cleanup_module(void)
...@@ -409,14 +439,11 @@ void cleanup_module(void) ...@@ -409,14 +439,11 @@ void cleanup_module(void)
int this_dev; int this_dev;
for (this_dev = 0; this_dev < MAX_ULTRA32_CARDS; this_dev++) { for (this_dev = 0; this_dev < MAX_ULTRA32_CARDS; this_dev++) {
struct net_device *dev = &dev_ultra[this_dev]; struct net_device *dev = dev_ultra[this_dev];
if (dev->priv != NULL) { if (dev) {
int ioaddr = dev->base_addr - ULTRA32_NIC_OFFSET;
void *priv = dev->priv;
/* NB: ultra32_close_card() does free_irq */
release_region(ioaddr, ULTRA32_IO_EXTENT);
unregister_netdev(dev); unregister_netdev(dev);
kfree(priv); cleanup_card(dev);
free_netdev(dev);
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment