From f96d1ee4176359ff1456f5bfe567bb899a5287a9 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 25 Sep 2003 12:57:16 -0400 Subject: [PATCH] [PATCH] [PATCH 2.6.0-test1] remove check_region from drivers_net_3c509.c From: Domen Puncer --- drivers/net/3c509.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c index 74fd4100332bf..7108ff0bf2087 100644 --- a/drivers/net/3c509.c +++ b/drivers/net/3c509.c @@ -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 @@ no_pnp: #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? */ -- 2.53.0