From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753568AbdHKRFh (ORCPT ); Fri, 11 Aug 2017 13:05:37 -0400 Received: from mout.web.de ([212.227.15.4]:56189 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752850AbdHKRFf (ORCPT ); Fri, 11 Aug 2017 13:05:35 -0400 To: alsa-devel@alsa-project.org, Akshay Bhat , Daniel Mack , Dennis Kadioglu , Jaroslav Kysela , Johan Hovold , Nobutaka Okabe , Takashi Iwai Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] ALSA: usb: Delete an error message for a failed memory allocation in two functions Message-ID: Date: Fri, 11 Aug 2017 19:04:41 +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:RTRUMUmHUOb8q2NktAdjDbowTzVocSG77cDmabduCrGbczhhNGQ lbIq0Bj1uOpZa5+hIGbufl9h2ukuQVbcNRGLzpsF2esIkdUwiImzA78WdNncpg3IGiQeKsf AOnGKQfbRA3POsFZtDR1MOYVueicVEMH3btHfUXQiVLFm5nuiSvmDKZ9cdl6HVWsyKNP+Pz 4CW0WhrSxTFUcrspNpaNA== X-UI-Out-Filterresults: notjunk:1;V01:K0:FXKa4JYH4TA=:sxN4tDSlTtBS2EENCL+Pu3 sqdwOQtbKIaWrWIsgB3ZmzjdT7iG1UwES+JSy6HvBPpsXLVqyJqkuSL3kpmJddmsnaGBbV6i3 8ZQW+CRvZkv4lVc72dp81a1jGPsoc3q8ojJTv4kkbUp37ZBXhJ1j9lw2paDYtk0azURByn9cu 2NAAREaVSFec7A4A41zpI0SaMkvnGUL+Vhv9u4fq4iLxFBofmqq0bbuzsbOhsBx1rzCQEtANE MmC0NRh8WxVfyphy+ePvTv5vfjOH3w7EtEGIIuuwfJPtKTnlScfMgVWBFUv/8qujsmrcYaVze tvig809ED7HIntBjqdaz0D9MkC5KVAPfeNvxLAFirYTVxDsbrQdQuLou2MB7Olmyh0ZeYWr52 sfLqcpxhZTLS3INek2pVM7khD+0JunKWQfXmtFXyBYhx1lvBLtcFZ1uPDT69/+p5Z9eKOB/iT zGIYsCdbKrudfxmZ0tDroHCJbvupWUtbipFkKz4KbXUr86OlEn/mzXsf6LV1MUKtF4LibdEPO 0dCTIfetJaEz6B/Ey/5MfpgwFmNVB70/nCgdvJcmhfNPnLuo1SOZSPkAVX+WVRcjws4esQbJz GxKtjgwFiKmTEG0T+07IgQw+von36tW4KVErUUa0aeZAjIBKzvQuHvS4/6h20fu8rI7KR/7h6 nbhXkghy6xeFJdZ6dGpuHHTN2wuaKS/6urbvehN95GPI4V97LHBfBGMNsMJPLxRLhMOjPzQ1p w8gX7AHYgtT403D6GeeK/ilHKSjmdpA1v4HPFb7ZV5/0GlMAMz38qCNQ3Q6dBAFr0DzpQ9cyI PLt0uCKtnyl/ufsUKnidgSHAJWB2mon5GOXYK0W4gDB97aaXBQ= 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 18:38:25 +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/quirks.c | 5 ++--- sound/usb/stream.c | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index d7b0b0a3a2db..9db40d58b4e2 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -146,10 +146,9 @@ static int create_fixed_stream_quirk(struct snd_usb_audio *chip, unsigned *rate_table = NULL; fp = kmemdup(quirk->data, sizeof(*fp), GFP_KERNEL); - if (!fp) { - usb_audio_err(chip, "cannot memdup\n"); + if (!fp) return -ENOMEM; - } + INIT_LIST_HEAD(&fp->list); if (fp->nr_rates > MAX_NR_RATES) { kfree(fp); diff --git a/sound/usb/stream.c b/sound/usb/stream.c index 8e9548bc1f1a..d1776e5517ff 100644 --- a/sound/usb/stream.c +++ b/sound/usb/stream.c @@ -658,10 +658,8 @@ int snd_usb_parse_audio_interface(struct snd_usb_audio *chip, int iface_no) continue; fp = kzalloc(sizeof(*fp), GFP_KERNEL); - if (! fp) { - dev_err(&dev->dev, "cannot malloc\n"); + if (!fp) return -ENOMEM; - } fp->iface = iface_no; fp->altsetting = altno; -- 2.14.0