projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[powerpc.git]
/
drivers
/
net
/
ac3200.c
diff --git
a/drivers/net/ac3200.c
b/drivers/net/ac3200.c
index
91791ba
..
7952dc6
100644
(file)
--- a/
drivers/net/ac3200.c
+++ b/
drivers/net/ac3200.c
@@
-123,14
+123,6
@@
static int __init do_ac3200_probe(struct net_device *dev)
return -ENODEV;
}
return -ENODEV;
}
-static void cleanup_card(struct net_device *dev)
-{
- /* Someday free_irq may be in ac_close_card() */
- free_irq(dev->irq, dev);
- release_region(dev->base_addr, AC_IO_EXTENT);
- iounmap(ei_status.mem);
-}
-
#ifndef MODULE
struct net_device * __init ac3200_probe(int unit)
{
#ifndef MODULE
struct net_device * __init ac3200_probe(int unit)
{
@@
-275,7
+267,7
@@
static int __init ac_probe1(int ioaddr, struct net_device *dev)
return 0;
out2:
if (ei_status.reg0)
return 0;
out2:
if (ei_status.reg0)
- iounmap(
(void *)dev->mem_start
);
+ iounmap(
ei_status.mem
);
out1:
free_irq(dev->irq, dev);
out:
out1:
free_irq(dev->irq, dev);
out:
@@
-406,6
+398,14
@@
init_module(void)
return -ENXIO;
}
return -ENXIO;
}
+static void cleanup_card(struct net_device *dev)
+{
+ /* Someday free_irq may be in ac_close_card() */
+ free_irq(dev->irq, dev);
+ release_region(dev->base_addr, AC_IO_EXTENT);
+ iounmap(ei_status.mem);
+}
+
void
cleanup_module(void)
{
void
cleanup_module(void)
{