aboutsummaryrefslogtreecommitdiff
path: root/sound/oss
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2015-01-03 15:10:52 +0100
committerTakashi Iwai <tiwai@suse.de>2015-01-04 15:11:56 +0100
commitd1f45e6037f1195d10cf363e94a08ee2f10f9b41 (patch)
tree4e68e24f1ef8deb949c21bf2caa2be1f8531bbff /sound/oss
parent57dca36ee25bcab20a71705175c00b6f114cdab4 (diff)
downloadlinux-stericsson-d1f45e6037f1195d10cf363e94a08ee2f10f9b41.tar.gz
sound: oss: Deletion of unnecessary checks before the function call "vfree"
The vfree() function performs also input parameter validation. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/oss')
-rw-r--r--sound/oss/pss.c2
-rw-r--r--sound/oss/trix.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/pss.c b/sound/oss/pss.c
index ca0d6e9f49f5..81314f9e2ccb 100644
--- a/sound/oss/pss.c
+++ b/sound/oss/pss.c
@@ -1228,7 +1228,7 @@ static void __exit cleanup_pss(void)
{
if(!pss_no_sound)
{
- if(fw_load && pss_synth)
+ if (fw_load)
vfree(pss_synth);
if(pssmss)
unload_pss_mss(&cfg2);
diff --git a/sound/oss/trix.c b/sound/oss/trix.c
index 944e0c015485..3c494dc93b93 100644
--- a/sound/oss/trix.c
+++ b/sound/oss/trix.c
@@ -487,7 +487,7 @@ static int __init init_trix(void)
static void __exit cleanup_trix(void)
{
- if (fw_load && trix_boot)
+ if (fw_load)
vfree(trix_boot);
if (sb)
unload_trix_sb(&cfg2);