Commit f96d1ee4 authored by Rusty Russell's avatar Rusty Russell Committed by Jeff Garzik

[PATCH] [PATCH 2.6.0-test1] remove check_region from drivers_net_3c509.c

From:  Domen Puncer <root@coderock.org>
parent 0b7fab69
......@@ -382,9 +382,7 @@ static int __init el3_probe(int card_idx)
#if defined(__ISAPNP__) && !defined(CONFIG_X86_PC9800)
static int pnp_cards;
struct pnp_dev *idev = NULL;
#endif /* __ISAPNP__ */
#if defined(__ISAPNP__) && !defined(CONFIG_X86_PC9800)
if (nopnp == 1)
goto no_pnp;
......@@ -440,12 +438,15 @@ static int __init el3_probe(int card_idx)
#else
/* Select an open I/O location at 0x1*0 to do contention select. */
for ( ; id_port < 0x200; id_port += 0x10) {
if (check_region(id_port, 1))
if (!request_region(id_port, 1, "3c509"))
continue;
outb(0x00, id_port);
outb(0xff, id_port);
if (inb(id_port) & 0x01)
if (inb(id_port) & 0x01){
release_region(id_port, 1);
break;
} else
release_region(id_port, 1);
}
if (id_port >= 0x200) {
/* Rare -- do we really need a warning? */
......
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