summaryrefslogtreecommitdiffstats
path: root/sound/synth
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2015-01-03 18:28:21 +0100
committerTakashi Iwai <tiwai@suse.de>2015-01-04 15:12:29 +0100
commitb172e0aae6d14baf646a36052d03b301535f4ef5 (patch)
tree8049612e1ec366e1b90b15b47d1f781625d1190c /sound/synth
parent1fac1686377410169952db63d282490bc0554662 (diff)
downloadop-kernel-dev-b172e0aae6d14baf646a36052d03b301535f4ef5.zip
op-kernel-dev-b172e0aae6d14baf646a36052d03b301535f4ef5.tar.gz
ALSA: emux: Delete an unnecessary check before the function call "snd_sf_free"
The snd_sf_free() function tests whether its argument is NULL and then returns immediately. 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/synth')
-rw-r--r--sound/synth/emux/emux.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/synth/emux/emux.c b/sound/synth/emux/emux.c
index 9352207..f27a1c8 100644
--- a/sound/synth/emux/emux.c
+++ b/sound/synth/emux/emux.c
@@ -160,12 +160,8 @@ int snd_emux_free(struct snd_emux *emu)
snd_emux_detach_seq_oss(emu);
#endif
snd_emux_detach_seq(emu);
-
snd_emux_delete_hwdep(emu);
-
- if (emu->sflist)
- snd_sf_free(emu->sflist);
-
+ snd_sf_free(emu->sflist);
kfree(emu->voices);
kfree(emu->name);
kfree(emu);
OpenPOWER on IntegriCloud