Commit 64d6671f authored by Jeff Garzik's avatar Jeff Garzik

[netdrvr wavelan] remove check_region usage

parent 1afaa712
...@@ -3730,8 +3730,8 @@ static int wv_check_ioaddr(unsigned long ioaddr, u8 * mac) ...@@ -3730,8 +3730,8 @@ static int wv_check_ioaddr(unsigned long ioaddr, u8 * mac)
int i; /* Loop counter */ int i; /* Loop counter */
/* Check if the base address if available. */ /* Check if the base address if available. */
if (check_region(ioaddr, sizeof(ha_t))) if (!request_region(ioaddr, sizeof(ha_t), "wavelan probe"))
return -EADDRINUSE; /* ioaddr already used */ return -EBUSY; /* ioaddr already used */
/* Reset host interface */ /* Reset host interface */
wv_hacr_reset(ioaddr); wv_hacr_reset(ioaddr);
...@@ -3740,6 +3740,8 @@ static int wv_check_ioaddr(unsigned long ioaddr, u8 * mac) ...@@ -3740,6 +3740,8 @@ static int wv_check_ioaddr(unsigned long ioaddr, u8 * mac)
psa_read(ioaddr, HACR_DEFAULT, psaoff(0, psa_univ_mac_addr), psa_read(ioaddr, HACR_DEFAULT, psaoff(0, psa_univ_mac_addr),
mac, 6); mac, 6);
release_region(ioaddr, sizeof(ha_t));
/* /*
* Check the first three octets of the address for the manufacturer's code. * Check the first three octets of the address for the manufacturer's code.
* Note: if this can't find your WaveLAN card, you've got a * Note: if this can't find your WaveLAN card, you've got a
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment