From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752627AbdHIIGG (ORCPT ); Wed, 9 Aug 2017 04:06:06 -0400 Received: from mout.web.de ([217.72.192.78]:50670 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752338AbdHIIGE (ORCPT ); Wed, 9 Aug 2017 04:06:04 -0400 Subject: [PATCH 4/4] ALSA: emux: Delete two error messages for a failed memory allocation in snd_emux_create_port() From: SF Markus Elfring To: alsa-devel@alsa-project.org, Jaroslav Kysela , Kees Cook , Takashi Iwai , Takashi Sakamoto Cc: LKML , kernel-janitors@vger.kernel.org References: <412aa3a5-c8b6-c1fe-febb-0d62927dacc2@users.sourceforge.net> Message-ID: Date: Wed, 9 Aug 2017 10:04:46 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <412aa3a5-c8b6-c1fe-febb-0d62927dacc2@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:kBJCTLDHIhPj0ixN/aSAdg6fe3HhIUmFESbem3WfBjo6W1zpUQV i4wjdKe2QnmYG7x1quD12EC47UbLyAW73IALs/iFYogIHNrGx8tPm1eqnMjGNZThv4DNAQy 8QO0BbWo586sU5pm3FmGN+60R4YnqLlR+irNJanorqytwxOX7o7uV9iC6VU55c7qwkdePyz FNV8RXDICB0OjQlGFIzzA== X-UI-Out-Filterresults: notjunk:1;V01:K0:7BLct88Sybg=:cz3CsG9Gdn/VlcXphHVL9h ccFSGkFIeNrnWWiAtE7frP7hedgJbSmMWD2UpS0EPiV1bhxkcJGrDB9bTEWRWp6GIybnGGQ8P mhj8XQgz2Na3eTzqvmkb99FF2RcZw9oqAiBY/cdvFd3sN8xTDw5Z0YKQEmJlWFFi5vJD5WNJr 4NVsVWepli3HCjGRU0bntLU9feX81hhE3cbgebZlY6Sn3YG/ctMbWYtkDjxgz3s/QL6xgMKww e9xKLvB6F4abFrgJ52OyZFfDSfaqeGT/p0eIkDiKn6HXri4BVjcAbs3fAtnuKOx6+0/d/U0qJ rpvCkKmd43RImbjFTlpLi0AjFBS4675h23bLhYwGvV5Luv7orNSHziHk3eOVzdp5B1acsT9nI 5Z/jPPFm4kJHyUGDDfEVRXrnp4/JJN/V5KX8yihCz8TRO+VPmBVxszh9YQ3YumWI+6hYpAISF QdxsMhCF8/jefdNaXNmIxxLAOxuVbZZYfrzqZYxqvAd7sIQAZAofX8aZT4XpRGJnWlUFbC6gO q5qyTiMm2NUXiyi5TIA/2YnnKMUj5Uc0l1gobpLFMpaGlRXcvy0PsV8gtiI4Li+ERK2SPzQRb H5MR8Z/P4fYOX59pYyB0d0h1IF73UZyMwWmKW5izdCdabnlXOUNnsm0BzgRRJ90mr5lXuzAUw 9I+4aTxdY8LSVMBcVNHXcBgPODaLZlM45Ung6Q1pDmFYWzncnWY5/EoOCTC9TcJAXP3bdWuTH 6I1S+goBV4ekK46vy4759VJuHy8Ol+1N5BxlsTbZiO+qQ4T1rN4B6z1kvj81mmhqGrmdUMV1m ohwhRo2wIeGBXMK9ONsmFDl+81RENVu5/NODFGsUKsCIycV9Us= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 9 Aug 2017 09:30:34 +0200 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 --- sound/synth/emux/emux_seq.c | 6 ++---- 1 file 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; } -- 2.13.4