summaryrefslogtreecommitdiff
path: root/drivers/staging/crystalhd
diff options
context:
space:
mode:
authorScott Kidder <scott.kidder11@gmail.com>2010-05-26 23:38:45 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-06-18 16:41:25 -0700
commit6167944d8a28c6a405babc4ae0f830be80a13fbb (patch)
tree1c023852a54880395800d338b6803ef553510b7e /drivers/staging/crystalhd
parentef079a76fe78d713eb695a222601fccb3e706f0f (diff)
Staging: crystalhd: removed kfree(NULL) checks
Removed kfree(NULL checks) that were not necessary Signed-off-by: Scott Kidder <scott.kidder11@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/crystalhd')
-rw-r--r--drivers/staging/crystalhd/crystalhd_lnx.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c
index a4ec891328cd..9d2805a33fd6 100644
--- a/drivers/staging/crystalhd/crystalhd_lnx.c
+++ b/drivers/staging/crystalhd/crystalhd_lnx.c
@@ -152,10 +152,8 @@ static int chd_dec_fetch_cdata(struct crystalhd_adp *adp, struct crystalhd_ioctl
if (rc) {
BCMLOG_ERR("failed to pull add_cdata sz:%x ua_off:%x\n",
io->add_cdata_sz, (unsigned int)ua_off);
- if (io->add_cdata) {
- kfree(io->add_cdata);
- io->add_cdata = NULL;
- }
+ kfree(io->add_cdata);
+ io->add_cdata = NULL;
return -ENODATA;
}
@@ -435,8 +433,7 @@ static void __devexit chd_dec_release_chdev(struct crystalhd_adp *adp)
/* Clear iodata pool.. */
do {
temp = chd_dec_alloc_iodata(adp, 0);
- if (temp)
- kfree(temp);
+ kfree(temp);
} while (temp);
crystalhd_delete_elem_pool(adp);