From patchwork Thu Nov 16 17:08:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 10061549 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EBDAB601AE for ; Thu, 16 Nov 2017 17:08:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D4F7F2AB6B for ; Thu, 16 Nov 2017 17:08:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C8E302AB8B; Thu, 16 Nov 2017 17:08:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 038452AB6B for ; Thu, 16 Nov 2017 17:08:37 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id E0D17267753; Thu, 16 Nov 2017 18:08:35 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id AC0C9267755; Thu, 16 Nov 2017 18:08:34 +0100 (CET) Received: from mout.web.de (mout.web.de [212.227.17.12]) by alsa0.perex.cz (Postfix) with ESMTP id 2C149266EE4 for ; Thu, 16 Nov 2017 18:08:32 +0100 (CET) Received: from [192.168.1.3] ([78.50.159.33]) by smtp.web.de (mrweb101 [213.165.67.124]) with ESMTPSA (Nemesis) id 0LqUPN-1esaI1081p-00e6cq; Thu, 16 Nov 2017 18:08:28 +0100 From: SF Markus Elfring To: alsa-devel@alsa-project.org, Arvind Yadav , Jaroslav Kysela , Takashi Iwai , Takashi Sakamoto References: Message-ID: <5e96250a-b436-4b33-0ffa-3f9a51346827@users.sourceforge.net> Date: Thu, 16 Nov 2017 18:08:26 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-GB X-Provags-ID: V03:K0:OOG9XT6B5HzxMI30ir4YzM7hhXPFh9UOVOHnnUyMbWYd58ce94C /j73gyOlpxx1VumXVkK3fz6wBhCRTbPz4FinU6ySKt+50/z5QRBWzsiD690otcH1cPrKTyF P/+4+XcRR3Q+a3nNJuSLGCS9JC03qJ7lja+7DkBQUtV4h5DDQTY10oPc3gZVjcnPBoKQrFP Hp6jDMVKlteNDUvFUULKg== X-UI-Out-Filterresults: notjunk:1; V01:K0:OYVies8Bi2A=:KZf2VNHWHSd027gIkThERK 8tS41zZb2S4zd1U9P7BvLFP6wIvAeaflePGnz2wiaRiEoFfskcEP5wVYRVKCtvUKLX7BR83fi hL1PzGqy8OcqNvWvmr6YNKKV8Pe6DoT0cx0aB/yfXb3AJ8Y3X/A79+qJhafSNM93rRT0q2hIA ldB1Y19irUvWeoVzTLIlHUuUt75WAu3yb2M3EgYVZE/lgXiw2Hzye4uS7nYju25qcfTLoyLA2 RSLDRcKpBpM3Io7gP7UTkuXATHlDuHEtq7EDfRfOUwR3ErG2oV+kYy0e3WvvMcDvfvzxl9NbW IkKh9ms+a85v1M59PRTthi7+++MirbX9miQWw3y6gkNfp1KzginCz+YBXNgtRqZ+Z2UpvgpI1 QLLD2GNg6COBRrsIgZXUfV3UeeM+/ekir5cMsN+ppazmbDY1jauu942qRlnaPMH9x9SOTkWBd V1XQXRPSG0zSHWsgsq54VSrLq63/Fy5c33BK5OL8sfomQu+osmHIT7sQw8to+9vNROkahQPV8 C0jgkdl/4juEpUzkGQphbQEvih4Kxl9C8OtdzBnUa7UJcsj+mMp8VmNic4RmdXX7RE8Cdb4qG PILo3vJHjLgYCtmdDrjxgKj3SfPuLkVWggQxjWHFcGRKRECmqgaTLs8bfrwOSSCEhY/78EOmy XubM8o7/Ias7XN8VX5+RB9vN1FZKcmM7eLP4B2IKwz83dumHc0cnI3YYfrgI4nlE766nxNCeb VoZ254HgRI1L+U/2e0UNohUT27fRiZzn06+YIW/a8ZClYE/2TBmTcN26ePvZuuUfP+0mn0zGR 4r3Jl32fNe/rxKmWP1m+vWZ1CK2UFy0c0CQKrYuOxhX+Gr9Kw8= Cc: kernel-janitors@vger.kernel.org, LKML Subject: [alsa-devel] [PATCH 2/2] ALSA: nm256: Use common error handling code in snd_nm256_probe() X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Thu, 16 Nov 2017 17:51:17 +0100 This issue was detected by using the Coccinelle software. * Add a jump target so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. * The script "checkpatch.pl" pointed information out like the following. ERROR: do not use assignment in if condition Thus fix two affected source code places. Signed-off-by: Markus Elfring --- sound/pci/nm256/nm256.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c index 35ce5b3fd81a..3d6106800ae9 100644 --- a/sound/pci/nm256/nm256.c +++ b/sound/pci/nm256/nm256.c @@ -1706,8 +1706,8 @@ static int snd_nm256_probe(struct pci_dev *pci, break; default: dev_err(&pci->dev, "invalid device id 0x%x\n", pci->device); - snd_card_free(card); - return -EINVAL; + err = -EINVAL; + goto free_card; } if (vaio_hack) @@ -1723,10 +1723,9 @@ static int snd_nm256_probe(struct pci_dev *pci, capture_bufsize = 128; err = snd_nm256_create(card, pci, &chip); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; + card->private_data = chip; if (reset_workaround) { @@ -1739,11 +1738,13 @@ static int snd_nm256_probe(struct pci_dev *pci, chip->reset_workaround_2 = 1; } - if ((err = snd_nm256_pcm(chip, 0)) < 0 || - (err = snd_nm256_mixer(chip)) < 0) { - snd_card_free(card); - return err; - } + err = snd_nm256_pcm(chip, 0); + if (err < 0) + goto free_card; + + err = snd_nm256_mixer(chip); + if (err < 0) + goto free_card; sprintf(card->shortname, "NeoMagic %s", card->driver); sprintf(card->longname, "%s at 0x%lx & 0x%lx, irq %d", @@ -1751,13 +1752,15 @@ static int snd_nm256_probe(struct pci_dev *pci, chip->buffer_addr, chip->cport_addr, chip->irq); err = snd_card_register(card); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; pci_set_drvdata(pci, card); return 0; + +free_card: + snd_card_free(card); + return err; } static void snd_nm256_remove(struct pci_dev *pci)