staging: crystalhd: fix memory leaks

Free resources before exit.

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/crystalhd/crystalhd_hw.c b/drivers/staging/crystalhd/crystalhd_hw.c
index 153ddbf4247d6f47d8da95dcea3e3ca6415b94f1..13a514dd0f7985f7bc5715f6ff93a07fc9b1f382 100644 (file)
--- a/drivers/staging/crystalhd/crystalhd_hw.c
+++ b/drivers/staging/crystalhd/crystalhd_hw.c
@@ -1965,6 +1965,7 @@ enum BC_STATUS crystalhd_hw_setup_dma_rings(struct crystalhd_hw *hw)
                } else {
                        BCMLOG_ERR("Insufficient Memory For RX\n");
                        crystalhd_hw_free_dma_rings(hw);
+                       kfree(rpkt);
                        return BC_STS_INSUFF_RES;
                }
                rpkt->desc_mem.pdma_desc_start = mem;

diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c
index c1ee24c98315ad4001b65e4de6d3d426f1763a07..7e0c199f68939cf03b7e96328061aaeca3d4f561 100644 (file)
--- a/drivers/staging/crystalhd/crystalhd_lnx.c
+++ b/drivers/staging/crystalhd/crystalhd_lnx.c
@@ -559,7 +559,7 @@ static int __devinit chd_dec_pci_probe(struct pci_dev *pdev,
        rc = pci_enable_device(pdev);
        if (rc) {
                BCMLOG_ERR("Failed to enable PCI device\n");
-               return rc;
+               goto err;
        }
 
        snprintf(pinfo->name, sizeof(pinfo->name), "crystalhd_pci_e:%d:%d:%d",
@@ -570,7 +570,8 @@ static int __devinit chd_dec_pci_probe(struct pci_dev *pdev,
        if (rc) {
                BCMLOG_ERR("Failed to setup memory regions.\n");
                pci_disable_device(pdev);
-               return -ENOMEM;
+               rc = -ENOMEM;
+               goto err;
        }
 
        pinfo->present  = 1;
@@ -585,7 +586,8 @@ static int __devinit chd_dec_pci_probe(struct pci_dev *pdev,
        if (rc) {
                BCMLOG_ERR("_enable_int err:%d\n", rc);
                pci_disable_device(pdev);
-               return -ENODEV;
+               rc = -ENODEV;
+               goto err;
        }
 
        /* Set dma mask... */
@@ -598,14 +600,16 @@ static int __devinit chd_dec_pci_probe(struct pci_dev *pdev,
        } else {
                BCMLOG_ERR("Unabled to setup DMA %d\n", rc);
                pci_disable_device(pdev);
-               return -ENODEV;
+               rc = -ENODEV;
+               goto err;
        }
 
        sts = crystalhd_setup_cmd_context(&pinfo->cmds, pinfo);
        if (sts != BC_STS_SUCCESS) {
                BCMLOG_ERR("cmd setup :%d\n", sts);
                pci_disable_device(pdev);
-               return -ENODEV;
+               rc = -ENODEV;
+               goto err;
        }
 
        pci_set_master(pdev);
@@ -615,6 +619,10 @@ static int __devinit chd_dec_pci_probe(struct pci_dev *pdev,
        g_adp_info = pinfo;
 
        return 0;
+
+err:
+       kfree(pinfo);
+       return rc;
 }
 
 #ifdef CONFIG_PM