From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753569AbdHKQDg (ORCPT ); Fri, 11 Aug 2017 12:03:36 -0400 Received: from mout.web.de ([212.227.15.14]:63634 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752989AbdHKQDb (ORCPT ); Fri, 11 Aug 2017 12:03:31 -0400 To: alsa-devel@alsa-project.org, Jaroslav Kysela , Takashi Iwai From: SF Markus Elfring Subject: [PATCH] ALSA: usx2y: Delete an error message for a failed memory allocation in two functions Cc: LKML , kernel-janitors@vger.kernel.org Message-ID: <5ca1485e-5aaf-3c42-a24e-fb834239182e@users.sourceforge.net> Date: Fri, 11 Aug 2017 18:02:15 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:bu1e7YEfI/lEhoha+ESLBm/cMsNvTOqXtsRqvHcxhPdwdxPdWPQ X64ueHMbSq1u8NTB+aqfc0Or+dOw6C6WLChT7yE/ZrTicNkUj5FtyDHuMc7UFvXeSQnWLG0 6Q3rFeu0nBchz8skRwYsRAKr1gFyVjiM7JvvU5eQ4N2pR/lzy1ds38ZWfRq+7f2H9steKQb KfgtgbYt1q2L7iyJB8iog== X-UI-Out-Filterresults: notjunk:1;V01:K0:Dkeh8FZWKaM=:NXayhAVkSp6UIERR701vPY 0wYJyuOYBVsKw9viDz3Ew9qiQuoEAAaDBTLO9PAlyxdI7j1njWpVgA24uK1zGHOlrLg0/9HZd 22AYCLuJ79/xfFkeGbm7XXLx+EBQu3eCf9p/N5jKXAcVHN7zMIhIUSmHMFKHPtI8sl0uME+KH IVhdJvyNqYfr6c89m+18Vv3DEsMaDQW0gcZXIomYty2e9eA+AUG11iEf+hFfIuJtNHrZb5wYV kiXXb9AqRSnEmkxXbaRkAATXMk7cTQxuJEVab8/YHH2IbmLoFtrL9tsuxwPt9US1izDlUXESC CPEE49/NUQrQZJ+kFvk6s7IOtbjBNHg8erbvDF0q/wjlQm+R14sWSyxbsHhAA9UY+ujuKm8sV cR4ZZUMXRD+65Qup17n4vYiUndUfgTzVYWf14auxkck1vJ+8K620Jm4eigiHnkyqwOaSwquv1 u8o6E/YXVsJSGsYiNn0NozgPJDdzPuhHQuaiRjTwRuEO9XtXx5KxtUdzZ6LeEJboJDXaf7kxz HmRPlmocmbu4XaRtSkmZEeOoRHoVR59qMNt4oI6oonZPopqXX+e1zQJjEt/yWxFKQZSVt3Pq9 VjJcyWVGWt9uK6uregDC2XBYavMaadVbW1jotYpVXKSeVrYAJwVs78oYmSCWiCV88qa9wLKFR PsAF4+y6a32gYoTaTejsBlfInz2PyAo9MDIAVO0F5eWq09Qg1tD5kCKaTxyBXz3iaICliQYuN n+v5rk8M74vazi5S1M1OB/K8y9E6/QgzGLQAfvsag/Jt42CksY4DGXlPZQWfE/tuc0qw1i01s Gn93p2vecqTZDt5qUnkTZs8Uwtvb0qaS9U7QVIjo5jWgGmyPGU= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 11 Aug 2017 17:40:57 +0200 Omit an extra message for a memory allocation failure in these functions. 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/usb/usx2y/usbusx2yaudio.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c index dd40ca9d858a..612aa7ff7e18 100644 --- a/sound/usb/usx2y/usbusx2yaudio.c +++ b/sound/usb/usx2y/usbusx2yaudio.c @@ -422,7 +422,5 @@ static int usX2Y_urbs_allocate(struct snd_usX2Y_substream *subs) - if (NULL == subs->tmpbuf) { - snd_printk(KERN_ERR "cannot malloc tmpbuf\n"); + if (!subs->tmpbuf) return -ENOMEM; - } } /* allocate and initialize data urbs */ for (i = 0; i < NRURBS; i++) { @@ -952,7 +950,6 @@ static int usX2Y_audio_stream_new(struct snd_card *card, int playback_endpoint, - if (NULL == usX2Y_substream[i]) { - snd_printk(KERN_ERR "cannot malloc\n"); + if (!usX2Y_substream[i]) return -ENOMEM; - } + usX2Y_substream[i]->usX2Y = usX2Y(card); } -- 2.14.0