]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
jsm: Remove the uart port on errors
authorBreno Leitao <leitao@linux.vnet.ibm.com>
Thu, 7 Oct 2010 16:40:42 +0000 (13:40 -0300)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 22 Oct 2010 17:20:10 +0000 (10:20 -0700)
If kzmalloc fails, the uart port is not removed causing a leak.
This patch just add another label that removes the uart when the
kzmalloc fails.

Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/serial/jsm/jsm_driver.c

index eaf545014119cda24fe4a115e5b3c3a7ffe9b9e4..18f548449c63c886a753ca569121abe94c26f3db 100644 (file)
@@ -172,13 +172,15 @@ static int __devinit jsm_probe_one(struct pci_dev *pdev, const struct pci_device
                        jsm_uart_port_init here! */
                dev_err(&pdev->dev, "memory allocation for flipbuf failed\n");
                rc = -ENOMEM;
-               goto out_free_irq;
+               goto out_free_uart;
        }
 
        pci_set_drvdata(pdev, brd);
        pci_save_state(pdev);
 
        return 0;
+ out_free_uart:
+       jsm_remove_uart_port(brd);
  out_free_irq:
        jsm_remove_uart_port(brd);
        free_irq(brd->irq, brd);