Commit 565d96f0 authored by Karol Kasprzak's avatar Karol Kasprzak Committed by Jeff Garzik

de620 net driver janitor fixes:

* free_irq on error
* check request_region error value
parent 87e3ee60
...@@ -449,11 +449,17 @@ static int de620_open(struct net_device *dev) ...@@ -449,11 +449,17 @@ static int de620_open(struct net_device *dev)
return ret; return ret;
} }
if (adapter_init(dev)) if (adapter_init(dev)) {
return -EIO; ret = -EIO;
goto out_free_irq;
}
netif_start_queue(dev); netif_start_queue(dev);
return 0; return 0;
out_free_irq:
free_irq(dev->irq, dev);
return ret;
} }
/************************************************ /************************************************
...@@ -850,7 +856,10 @@ int __init de620_probe(struct net_device *dev) ...@@ -850,7 +856,10 @@ int __init de620_probe(struct net_device *dev)
return -EBUSY; return -EBUSY;
} }
#endif #endif
request_region(dev->base_addr, 3, "de620"); if (!request_region(dev->base_addr, 3, "de620")) {
printk(KERN_ERR "io 0x%3lX, which is busy.\n", dev->base_addr);
return -EBUSY;
}
/* else, got it! */ /* else, got it! */
printk(", Ethernet Address: %2.2X", printk(", Ethernet Address: %2.2X",
......
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