From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751978AbdKKSMm (ORCPT ); Sat, 11 Nov 2017 13:12:42 -0500 Received: from mout.web.de ([212.227.15.4]:64458 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751699AbdKKSMk (ORCPT ); Sat, 11 Nov 2017 13:12:40 -0500 Subject: [PATCH 1/3] ALSA: hal2: Use common error handling code in hal2_probe() From: SF Markus Elfring To: alsa-devel@alsa-project.org, Arnd Bergmann , Arvind Yadav , Bhumika Goyal , Jaroslav Kysela , Mark Brown , Takashi Iwai Cc: LKML , kernel-janitors@vger.kernel.org References: <118a96d5-c52a-fd22-23d5-28f20de7ff22@users.sourceforge.net> Message-ID: Date: Sat, 11 Nov 2017 19:11:55 +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: <118a96d5-c52a-fd22-23d5-28f20de7ff22@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:ZqBa5pnjgAJLHa5DVYElkxQMawIseW7JX4Y7QWJCXanTFDCM8V6 UYYg8QCijwworOwm3LSxdPijY74pki7Z1/b7t8J2fflVN85W0keSFE4IG0mRhHgFfb0Q1aK /tYUa+C/u1qlSI3WSmWClelcH9QipdSQGCzjDnnisa9jM1MZz0vwSMRuMYsKsQDqoY/ukT+ eVWhHQmjw/GfI3zyRSztw== X-UI-Out-Filterresults: notjunk:1;V01:K0:RbbE5ONK1fo=:Rbt7fiOLhH2EHmyeMOH/4s mGu1oxILA4R/QsikI2moLm+hXIWOpIwFmg42+uOPsbebk1el7bIVUcZCuuo8eErc9bTUf64bp IxXYjGIOhYU6WcmCeRNg84/Jq01tE/O/b2/OKPvkl1YV0ErlX7c8XTZZrEVqXME+APTYF/SG9 TWX2EGgQV6ElvVe5EM6Umo0bJ9e23Okl6Q1qGdvqJgcUx5iLc3J28lwyBXDQxsUpaua2/Ksl7 jgNE3Lb/hN95GASstZBbdtSJ6IPgKZYr0IVx4YyhwaT127vyYjhuakCBCy7kA7em/FDJFViRh BRiyAcvt4uxO34vtkTYzGWLBamwGFMfcg7wc6eDR8SVcc8czlrIma119+xY9KZpsc4Ztj47YC q/wzekUkQbU0keEg/f9engSN+e7m5gVj+NMNSv1JJfKQJl2CkjU4ziLnPx9nAlkLEm9e3gOsg 7UT7NfDZm7CV4SrutZq3Wf89qcch7XScSV+AWqBexsx9VBhkWhZTEVITX8BBKRjCsF7GxFGmC U6bZ8nmP/mA0P42v6woOlScqeYp3baIIKD0+ao+Ch68EN3drRqimrjx4dc04NpWq+AgsNPedF TJQXjv1Pgyk6CHRVNXez7jZwi7hmomtdSKvFWoBYXgAWXHdlPpWZaN11pswhQhozQrrpFVdII IAuPG1a++T0FmFG77lCSQptT8VM1YiVtReF5oxfa/aJFDyTaqEa3+gvQYm4yWOSdhTsyCeBjF vMtUAQM3JqT7Gb2Kr3j3RP8plpLONTGbqq7SieLg47FaG/7A2T2vJvCSvEIUfFw3XNlsHz9C0 ioR6m9Rxp86iurcZvWcXJNINr8WJbdGgGaCTHleorMaPlgD1C8= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 11 Nov 2017 18:26:06 +0100 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. Signed-off-by: Markus Elfring --- sound/mips/hal2.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c index 37d378a26a50..30563d9aa5c8 100644 --- a/sound/mips/hal2.c +++ b/sound/mips/hal2.c @@ -887,21 +887,16 @@ static int hal2_probe(struct platform_device *pdev) return err; err = hal2_create(card, &chip); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; err = hal2_pcm_create(chip); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; + err = hal2_mixer_create(chip); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; strcpy(card->driver, "SGI HAL2 Audio"); strcpy(card->shortname, "SGI HAL2 Audio"); @@ -910,12 +905,15 @@ static int hal2_probe(struct platform_device *pdev) SGI_HPCDMA_IRQ); err = snd_card_register(card); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; + platform_set_drvdata(pdev, card); return 0; + +free_card: + snd_card_free(card); + return err; } static int hal2_remove(struct platform_device *pdev) -- 2.15.0