summaryrefslogtreecommitdiffstats
path: root/sound/synth/emux/emux_seq.c
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2017-08-09 09:30:34 +0200
committerTakashi Iwai <tiwai@suse.de>2017-08-10 17:55:13 +0200
commit64a591e67e30599bed0179f187e034cc0828010e (patch)
tree0f010116df51fc4601fbc29de8117e23bb0d0496 /sound/synth/emux/emux_seq.c
parentALSA: emux: Adjust four checks for null pointers (diff)
downloadlinux-64a591e67e30599bed0179f187e034cc0828010e.tar.xz
linux-64a591e67e30599bed0179f187e034cc0828010e.zip
ALSA: emux: Delete two error messages for a failed memory allocation in snd_emux_create_port()
Omit extra messages for a memory allocation failure in this function. This issue was detected by using the Coccinelle software. Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/synth/emux/emux_seq.c')
-rw-r--r--sound/synth/emux/emux_seq.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/synth/emux/emux_seq.c b/sound/synth/emux/emux_seq.c
index fd6cbd439511..396c406d0f77 100644
--- a/sound/synth/emux/emux_seq.c
+++ b/sound/synth/emux/emux_seq.c
@@ -145,14 +145,12 @@ snd_emux_create_port(struct snd_emux *emu, char *name,
/* Allocate structures for this channel */
p = kzalloc(sizeof(*p), GFP_KERNEL);
- if (!p) {
- snd_printk(KERN_ERR "no memory\n");
+ if (!p)
return NULL;
- }
+
p->chset.channels = kcalloc(max_channels, sizeof(*p->chset.channels),
GFP_KERNEL);
if (!p->chset.channels) {
- snd_printk(KERN_ERR "no memory\n");
kfree(p);
return NULL;
}