drivers/atm/he.c | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff -puN drivers/atm/he.c~drivers-atm-he-chas drivers/atm/he.c
--- linux-2.5.69-1.1042.92.10-to-1.1097/drivers/atm/he.c~drivers-atm-he-chas Thu May 8 00:59:44 2003
+++ linux-2.5.69-1.1042.92.10-to-1.1097-fr/drivers/atm/he.c Thu May 8 00:59:44 2003
@@ -354,29 +354,36 @@ he_init_one(struct pci_dev *pci_dev, con
{
struct atm_dev *atm_dev;
struct he_dev *he_dev;
+ int ret = -EIO;
printk(KERN_INFO "he: %s\n", version);
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,3,43)
- if (pci_enable_device(pci_dev)) return -EIO;
+ if (pci_enable_device(pci_dev))
+ goto out;
#endif
if (pci_set_dma_mask(pci_dev, HE_DMA_MASK) != 0)
{
printk(KERN_WARNING "he: no suitable dma available\n");
- return -EIO;
+ goto out_disable;
}
atm_dev = atm_dev_register(DEV_LABEL, &he_ops, -1, 0);
- if (!atm_dev) return -ENODEV;
+ if (!atm_dev) {
+ ret = -ENODEV;
+ goto out_disable;
+ }
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,3)
pci_set_drvdata(pci_dev, atm_dev);
#else
pci_dev->driver_data = atm_dev;
#endif
- he_dev = (struct he_dev *) kmalloc(sizeof(struct he_dev),
- GFP_KERNEL);
- if (!he_dev) return -ENOMEM;
+ he_dev = (struct he_dev *) kmalloc(sizeof(*he_dev), GFP_KERNEL);
+ if (!he_dev) {
+ ret = -ENOMEM;
+ goto out_deregister;
+ }
memset(he_dev, 0, sizeof(struct he_dev));
he_dev->pci_dev = pci_dev;
@@ -385,16 +392,27 @@ he_init_one(struct pci_dev *pci_dev, con
HE_DEV(atm_dev) = he_dev;
he_dev->number = atm_dev->number; /* was devs */
if (he_start(atm_dev)) {
- atm_dev_deregister(atm_dev);
- he_stop(he_dev);
- kfree(he_dev);
- return -ENODEV;
+ ret = -ENODEV;
+ goto out_stop;
}
he_dev->next = NULL;
if (he_devs) he_dev->next = he_devs;
he_devs = he_dev;
- return 0;
+ ret = 0;
+out:
+ return ret;
+
+out_stop:
+ he_stop(he_dev);
+ kfree(he_dev);
+out_deregister:
+ atm_dev_deregister(atm_dev);
+out_disable:
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,3,43)
+ pci_disable_device(pci_dev);
+#endif
+ goto out;
}
static void __devexit
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/