From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965249AbdKPRJT (ORCPT ); Thu, 16 Nov 2017 12:09:19 -0500 Received: from mout.web.de ([212.227.17.12]:61882 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935028AbdKPRJK (ORCPT ); Thu, 16 Nov 2017 12:09:10 -0500 Subject: [PATCH 2/2] ALSA: nm256: Use common error handling code in snd_nm256_probe() From: SF Markus Elfring To: alsa-devel@alsa-project.org, Arvind Yadav , Jaroslav Kysela , Takashi Iwai , Takashi Sakamoto Cc: LKML , kernel-janitors@vger.kernel.org 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-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit 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= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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) -- 2.15.0