diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 12:05:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 12:05:25 -0400 |
| commit | e5dfa9282f3db461a896a6692b529e1823ba98c6 (patch) | |
| tree | 574d23cebc57c657373b0e1b6692c047aba8dd6e /drivers/net/lne390.c | |
| parent | 5dd962494f76fb3ef1196cd420b5d6260d7a3766 (diff) | |
| parent | b2ab040db85835e54c7559533df7f85902617926 (diff) | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/lne390.c')
| -rw-r--r-- | drivers/net/lne390.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/lne390.c b/drivers/net/lne390.c index 27f0d8ac4c4..309d254842c 100644 --- a/drivers/net/lne390.c +++ b/drivers/net/lne390.c | |||
| @@ -298,7 +298,7 @@ static int __init lne390_probe1(struct net_device *dev, int ioaddr) | |||
| 298 | return 0; | 298 | return 0; |
| 299 | unmap: | 299 | unmap: |
| 300 | if (ei_status.reg0) | 300 | if (ei_status.reg0) |
| 301 | iounmap((void *)dev->mem_start); | 301 | iounmap(ei_status.mem); |
| 302 | cleanup: | 302 | cleanup: |
| 303 | free_irq(dev->irq, dev); | 303 | free_irq(dev->irq, dev); |
| 304 | return ret; | 304 | return ret; |