staging: sbe-2t3e3: fix error handling in t3e3_init_channel()

t3e3_init_channel() incorrectly handles errors in several places:
it returns zero and does not deallocate all required resources.
The patch fixes that places.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/sbe-2t3e3/module.c b/drivers/staging/sbe-2t3e3/module.c
index cd778b3a02b249cffceeea98974cf9018c30dfbd..8adb17816ad9c44f37388fe433d8086e0208707e 100644 (file)
--- a/drivers/staging/sbe-2t3e3/module.c
+++ b/drivers/staging/sbe-2t3e3/module.c
@@ -67,6 +67,7 @@ static int __devinit t3e3_init_channel(struct channel *channel, struct pci_dev *
        dev = alloc_hdlcdev(channel);
        if (!dev) {
                printk(KERN_ERR "SBE 2T3E3" ": Out of memory\n");
+               err = -ENOMEM;
                goto free_regions;
        }
 
@@ -82,8 +83,9 @@ static int __devinit t3e3_init_channel(struct channel *channel, struct pci_dev *
        else
                channel->h.slot = 0;
 
-       if (setup_device(dev, channel))
-               goto free_regions;
+       err = setup_device(dev, channel);
+       if (err)
+               goto free_dev;
 
        pci_read_config_dword(channel->pdev, 0x40, &val); /* mask sleep mode */
        pci_write_config_dword(channel->pdev, 0x40, val & 0x3FFFFFFF);
@@ -92,14 +94,19 @@ 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;
+               goto unregister_dev;
        }
 
        pci_set_drvdata(pdev, channel);
        return 0;
 
+unregister_dev:
+       unregister_hdlc_device(dev);
+free_dev:
+       free_netdev(dev);
 free_regions:
        pci_release_regions(pdev);
 disable: