[PATCH] staging/sbe-2t3e3: error path cleanup in t3e3_init_channel

[Devendra Naga]

    a) if alloc_hdlcdev fails, we are going into the free_regions,
and returning out the err (which is 0 by the prev call),
       return -ENOMEM if this function fail.

    b) setup_device also can fail, as it calls around the register_hdlc_dev which
is again a macro of the register_netdev.

       take the error from the setup_device and return it out in error condition

    c) request_irq when fails, we are freeing requested mem regions and disabling
the pci device(?) and returning err which is agian 0 here.

      take the error from request_irq and err path will take care of returning it.

as if we return 0 , at the init function, t3e3_init_card, we have a success case
and if there are two channels we call this function again, having the result of
it completely unknown.

This result in having the probe return 0, unloading the driver may (not) cause
ambigous result.

Signed-off-by: Devendra Naga <devendra.aaru@xxxxxxxxx>
---
 drivers/staging/sbe-2t3e3/module.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/sbe-2t3e3/module.c b/drivers/staging/sbe-2t3e3/module.c
index cd778b3..1a1a9be 100644
--- a/drivers/staging/sbe-2t3e3/module.c
+++ b/drivers/staging/sbe-2t3e3/module.c
@@ -66,6 +66,7 @@ static int __devinit t3e3_init_channel(struct channel *channel, struct pci_dev *
 
 	dev = alloc_hdlcdev(channel);
 	if (!dev) {
+		err = -ENOMEM;
 		printk(KERN_ERR "SBE 2T3E3" ": Out of memory\n");
 		goto free_regions;
 	}
@@ -82,7 +83,8 @@ static int __devinit t3e3_init_channel(struct channel *channel, struct pci_dev *
 	else
 		channel->h.slot = 0;
 
-	if (setup_device(dev, channel))
+	err = setup_device(dev, channel);
+	if (err)
 		goto free_regions;
 
 	pci_read_config_dword(channel->pdev, 0x40, &val); /* mask sleep mode */
@@ -92,7 +94,8 @@ static int __devinit t3e3_init_channel(struct channel *channel, struct pci_dev *
 	pci_read_config_dword(channel->pdev, PCI_COMMAND, &channel->h.command);
 	t3e3_init(channel);
 
-	if (request_irq(dev->irq, &t3e3_intr, IRQF_SHARED, dev->name, dev)) {
+	err = request_irq(dev->irq, &t3e3_intr, IRQF_SHARED, dev->name, dev);
+	if (err) {
 		printk(KERN_WARNING "%s: could not get irq: %d\n", dev->name, dev->irq);
 		goto free_regions;
 	}
-- 
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/