Commit c6f80836 authored by William Stinson's avatar William Stinson Committed by Jeff Garzik

[janitor] update the comx-hw-comx wan driver to remove call to check_region...

[janitor] update the comx-hw-comx wan driver to remove call to check_region and check the status of call to 
request_region instead.

I don't have this hardware so compilation checked only. 
parent ed749f85
...@@ -466,16 +466,16 @@ static int COMX_open(struct net_device *dev) ...@@ -466,16 +466,16 @@ static int COMX_open(struct net_device *dev)
} }
if (!twin_open) { 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; return -EAGAIN;
} }
if (request_irq(dev->irq, COMX_interrupt, 0, dev->name, if (request_irq(dev->irq, COMX_interrupt, 0, dev->name,
(void *)dev)) { (void *)dev)) {
printk(KERN_ERR "comx-hw-comx: unable to obtain irq %d\n", dev->irq); printk(KERN_ERR "comx-hw-comx: unable to obtain irq %d\n", dev->irq);
release_region(dev->base_addr, hw->io_extent);
return -EAGAIN; return -EAGAIN;
} }
ch->init_status |= IRQ_ALLOCATED; 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)) { if (!ch->HW_load_board || ch->HW_load_board(dev)) {
ch->init_status &= ~IRQ_ALLOCATED; ch->init_status &= ~IRQ_ALLOCATED;
retval=-ENODEV; retval=-ENODEV;
......
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