Removed the check_mem_region() call and replaced with request_mem_region().
--
Bob Miller Email: [email protected]
Open Source Development Lab Phone: 503.626.2455 Ext. 17
diff -Nru a/drivers/isdn/pcbit/drv.c b/drivers/isdn/pcbit/drv.c
--- a/drivers/isdn/pcbit/drv.c Wed Jun 25 16:18:28 2003
+++ b/drivers/isdn/pcbit/drv.c Wed Jun 25 16:18:28 2003
@@ -87,15 +87,13 @@
if (mem_base >= 0xA0000 && mem_base <= 0xFFFFF ) {
dev->ph_mem = mem_base;
- if (check_mem_region(dev->ph_mem, 4096)) {
+ if (!request_mem_region(dev->ph_mem, 4096, "PCBIT mem")) {
printk(KERN_WARNING
"PCBIT: memory region %lx-%lx already in use\n",
dev->ph_mem, dev->ph_mem + 4096);
kfree(dev);
dev_pcbit[board] = NULL;
return -EACCES;
- } else {
- request_mem_region(dev->ph_mem, 4096, "PCBIT mem");
}
dev->sh_mem = (unsigned char*)ioremap(dev->ph_mem, 4096);
}