[PATCH] Remove racy check_mem_region() call from pcbit_drv.c

From:  Bob Miller <rem@osdl.org>

  Removed the check_mem_region() call and replaced with request_mem_region().

diff --git a/drivers/isdn/pcbit/drv.c b/drivers/isdn/pcbit/drv.c
index 3b90480e33194bfcc66a145f375a663f030ad767..84418df30223c448d8bf5bc57afaf75967673051 100644 (file)
--- a/drivers/isdn/pcbit/drv.c
+++ b/drivers/isdn/pcbit/drv.c
@@ -87,15 +87,13 @@ int pcbit_init_dev(int board, int mem_base, int irq)
 
        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);
        }