git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated i586 config for planetlab
[linux-2.6.git]
/
drivers
/
net
/
ne-h8300.c
diff --git
a/drivers/net/ne-h8300.c
b/drivers/net/ne-h8300.c
index
86f34b5
..
8f40368
100644
(file)
--- a/
drivers/net/ne-h8300.c
+++ b/
drivers/net/ne-h8300.c
@@
-34,6
+34,8
@@
static const char version1[] =
#include "8390.h"
#include "8390.h"
+#define DRV_NAME "ne-h8300"
+
/* Some defines that people can play with if so inclined. */
/* Do we perform extra sanity checks on stuff ? */
/* Some defines that people can play with if so inclined. */
/* Do we perform extra sanity checks on stuff ? */
@@
-156,6
+158,7
@@
static void cleanup_card(struct net_device *dev)
release_region(dev->base_addr, NE_IO_EXTENT);
}
release_region(dev->base_addr, NE_IO_EXTENT);
}
+#ifndef MODULE
struct net_device * __init ne_probe(int unit)
{
struct net_device *dev = alloc_ei_netdev();
struct net_device * __init ne_probe(int unit)
{
struct net_device *dev = alloc_ei_netdev();
@@
-177,16
+180,12
@@
struct net_device * __init ne_probe(int unit)
err = do_ne_probe(dev);
if (err)
goto out;
err = do_ne_probe(dev);
if (err)
goto out;
- err = register_netdev(dev);
- if (err)
- goto out1;
return dev;
return dev;
-out1:
- cleanup_card(dev);
out:
free_netdev(dev);
return ERR_PTR(err);
}
out:
free_netdev(dev);
return ERR_PTR(err);
}
+#endif
static int __init ne_probe1(struct net_device *dev, int ioaddr)
{
static int __init ne_probe1(struct net_device *dev, int ioaddr)
{
@@
-200,7
+199,7
@@
static int __init ne_probe1(struct net_device *dev, int ioaddr)
struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
unsigned char bus_width;
struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
unsigned char bus_width;
- if (!request_region(ioaddr, NE_IO_EXTENT,
dev->name
))
+ if (!request_region(ioaddr, NE_IO_EXTENT,
DRV_NAME
))
return -EBUSY;
reg0 = inb_p(ioaddr);
return -EBUSY;
reg0 = inb_p(ioaddr);
@@
-321,8
+320,13
@@
static int __init ne_probe1(struct net_device *dev, int ioaddr)
dev->poll_controller = ei_poll;
#endif
NS8390_init(dev, 0);
dev->poll_controller = ei_poll;
#endif
NS8390_init(dev, 0);
- return 0;
+ ret = register_netdev(dev);
+ if (ret)
+ goto out_irq;
+ return 0;
+out_irq:
+ free_irq(dev->irq, dev);
err_out:
release_region(ioaddr, NE_IO_EXTENT);
return ret;
err_out:
release_region(ioaddr, NE_IO_EXTENT);
return ret;
@@
-629,11
+633,8
@@
int init_module(void)
err = init_reg_offset(dev, dev->base_addr);
if (!err) {
if (do_ne_probe(dev) == 0) {
err = init_reg_offset(dev, dev->base_addr);
if (!err) {
if (do_ne_probe(dev) == 0) {
- if (register_netdev(dev) == 0) {
- dev_ne[found++] = dev;
- continue;
- }
- cleanup_card(dev);
+ dev_ne[found++] = dev;
+ continue;
}
}
free_netdev(dev);
}
}
free_netdev(dev);