diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:22:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:22:43 -0400 |
| commit | 55faed1e607a24ca7f3453a3eb463ca8987f8139 (patch) | |
| tree | 70c1f910576713e799b5b409d9f4c3c56840526e /drivers/net/ac3200.c | |
| parent | 946e91f36e90eea46758dd725b1c3b239f270f68 (diff) | |
| parent | 0edd5b44913cd0aba6f23b626b407f70bb3fb018 (diff) | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/ac3200.c')
| -rw-r--r-- | drivers/net/ac3200.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ac3200.c b/drivers/net/ac3200.c index 91791ba37769..8a0af5453e21 100644 --- a/drivers/net/ac3200.c +++ b/drivers/net/ac3200.c | |||
| @@ -275,7 +275,7 @@ static int __init ac_probe1(int ioaddr, struct net_device *dev) | |||
| 275 | return 0; | 275 | return 0; |
| 276 | out2: | 276 | out2: |
| 277 | if (ei_status.reg0) | 277 | if (ei_status.reg0) |
| 278 | iounmap((void *)dev->mem_start); | 278 | iounmap(ei_status.mem); |
| 279 | out1: | 279 | out1: |
| 280 | free_irq(dev->irq, dev); | 280 | free_irq(dev->irq, dev); |
| 281 | out: | 281 | out: |