82596: free nonexistent resource fix

During booting of last vanilla kernel I got:
Trying to free nonexistent resource...

This because of if "ENABLE_APRICOT" is on we do:
request_region(ioaddr,...)
if (checksum test failed)
  goto out1;
dev->base_addr = ioaddr;//<-here mistake

out1:
release_region(dev->base_addr,...)

This change fixes this bug for me.

Signed-off-by: Evgeniy Dushistov <dushistov@mail.ru>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Evgeniy Dushistov 2007-11-04 23:22:29 +03:00 committed by Jeff Garzik
parent cacd40e07c
commit d2ea732e9e
1 changed files with 2 additions and 1 deletions

View File

@ -1192,6 +1192,8 @@ struct net_device * __init i82596_probe(int unit)
goto out;
}
dev->base_addr = ioaddr;
for (i = 0; i < 8; i++) {
eth_addr[i] = inb(ioaddr + 8 + i);
checksum += eth_addr[i];
@ -1209,7 +1211,6 @@ struct net_device * __init i82596_probe(int unit)
goto out1;
}
dev->base_addr = ioaddr;
dev->irq = 10;
}
#endif