Commit 989c3239 authored by Dave Jones's avatar Dave Jones

[PATCH] pcmcia tcic region cleanups

parent 82fa7a84
...@@ -392,7 +392,11 @@ static int __init init_tcic(void) ...@@ -392,7 +392,11 @@ static int __init init_tcic(void)
printk(KERN_INFO "Databook TCIC-2 PCMCIA probe: "); printk(KERN_INFO "Databook TCIC-2 PCMCIA probe: ");
sock = 0; sock = 0;
if (check_region(tcic_base, 16) == 0) { if (!request_region(tcic_base, 16, "tcic-2")) {
printk("could not allocate ports,\n ");
return -ENODEV;
}
else {
tcic_setw(TCIC_ADDR, 0); tcic_setw(TCIC_ADDR, 0);
if (tcic_getw(TCIC_ADDR) == 0) { if (tcic_getw(TCIC_ADDR) == 0) {
tcic_setw(TCIC_ADDR, 0xc3a5); tcic_setw(TCIC_ADDR, 0xc3a5);
...@@ -408,16 +412,13 @@ static int __init init_tcic(void) ...@@ -408,16 +412,13 @@ static int __init init_tcic(void)
if (tcic_getw(TCIC_ADDR) == 0xc3a5) sock = 2; if (tcic_getw(TCIC_ADDR) == 0xc3a5) sock = 2;
} }
} }
} else }
printk("could not allocate ports, ");
if (sock == 0) { if (sock == 0) {
printk("not found.\n"); printk("not found.\n");
release_region(tcic_base, 16);
return -ENODEV; return -ENODEV;
} }
request_region(tcic_base, 16, "tcic-2");
sockets = 0; sockets = 0;
for (i = 0; i < sock; i++) { for (i = 0; i < sock; i++) {
if ((i == ignore) || is_active(i)) continue; if ((i == ignore) || is_active(i)) continue;
......
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