From: Alexander Beregalov <a.beregalov@gmail.com>
To: gregkh@suse.de
Cc: linux-kernel@vger.kernel.org,
Alexander Beregalov <a.beregalov@gmail.com>
Subject: [PATCH next 4/6] staging: crystalhd: fix memory leaks
Date: Thu, 10 Mar 2011 05:43:06 +0300 [thread overview]
Message-ID: <1299724988-25351-4-git-send-email-a.beregalov@gmail.com> (raw)
In-Reply-To: <1299724988-25351-1-git-send-email-a.beregalov@gmail.com>
Free resources before exit.
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
---
drivers/staging/crystalhd/crystalhd_hw.c | 1 +
drivers/staging/crystalhd/crystalhd_lnx.c | 18 +++++++++++++-----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/crystalhd/crystalhd_hw.c b/drivers/staging/crystalhd/crystalhd_hw.c
index 153ddbf..13a514d 100644
--- 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 719e70b..2b47ef9 100644
--- a/drivers/staging/crystalhd/crystalhd_lnx.c
+++ b/drivers/staging/crystalhd/crystalhd_lnx.c
@@ -561,7 +561,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, 31, "crystalhd_pci_e:%d:%d:%d",
@@ -572,7 +572,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;
@@ -587,7 +588,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... */
@@ -600,14 +602,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);
@@ -617,6 +621,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
--
1.7.4.1
next prev parent reply other threads:[~2011-03-10 2:44 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-10 2:43 [PATCH next 1/6] staging: altera-stapl: " Alexander Beregalov
2011-03-10 2:43 ` [PATCH next 2/6] staging: bcm: " Alexander Beregalov
2011-03-11 22:31 ` Greg KH
2011-03-13 19:00 ` Alexander Beregalov
2011-03-10 2:43 ` [PATCH next 3/6] staging: brcm80211: " Alexander Beregalov
2011-03-10 2:43 ` Alexander Beregalov [this message]
2011-03-10 2:43 ` [PATCH next 5/6] staging: hv: " Alexander Beregalov
2011-03-10 2:43 ` [PATCH next 6/6] staging: ste_rmi4: " Alexander Beregalov
2011-03-11 22:29 ` [PATCH next 1/6] staging: altera-stapl: " Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1299724988-25351-4-git-send-email-a.beregalov@gmail.com \
--to=a.beregalov@gmail.com \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®