patch-2.4.20 linux-2.4.20/drivers/net/wan/comx-hw-comx.c

• Lines: 19
• Date: Thu Nov 28 15:53:14 2002
• Orig file: linux-2.4.19/drivers/net/wan/comx-hw-comx.c
• Orig date: Thu Sep 13 16:04:43 2001

diff -urN linux-2.4.19/drivers/net/wan/comx-hw-comx.c linux-2.4.20/drivers/net/wan/comx-hw-comx.c
@@ -466,16 +466,16 @@
 	}
 
 	if (!twin_open) {
-		if (check_region(dev->base_addr, hw->io_extent)) {
+		if (!request_region(dev->base_addr, hw->io_extent, dev->name)) {
 			return -EAGAIN;
 		}
 		if (request_irq(dev->irq, COMX_interrupt, 0, dev->name, 
 		   (void *)dev)) {
 			printk(KERN_ERR "comx-hw-comx: unable to obtain irq %d\n", dev->irq);
+			release_region(dev->base_addr, hw->io_extent);
 			return -EAGAIN;
 		}
 		ch->init_status |= IRQ_ALLOCATED;
-		request_region(dev->base_addr, hw->io_extent, dev->name);
 		if (!ch->HW_load_board || ch->HW_load_board(dev)) {
 			ch->init_status &= ~IRQ_ALLOCATED;
 			retval=-ENODEV;