From patchwork Sat Nov 18 21:15:57 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: 10064947 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 30501602B8 for ; Sat, 18 Nov 2017 21:25:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 17F2029330 for ; Sat, 18 Nov 2017 21:25:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0BE9A294D9; Sat, 18 Nov 2017 21:25:55 +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 4475929330 for ; Sat, 18 Nov 2017 21:25:53 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id D37872673CB; Sat, 18 Nov 2017 22:16:21 +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 4DAD52673CE; Sat, 18 Nov 2017 22:16:20 +0100 (CET) Received: from mout.web.de (mout.web.de [217.72.192.78]) by alsa0.perex.cz (Postfix) with ESMTP id 90F2A266EFA for ; Sat, 18 Nov 2017 22:16:18 +0100 (CET) Received: from [192.168.1.3] ([78.49.245.81]) by smtp.web.de (mrweb103 [213.165.67.124]) with ESMTPSA (Nemesis) id 0LaCbS-1f1r1d0FQc-00m1MR; Sat, 18 Nov 2017 22:15:59 +0100 To: alsa-devel@alsa-project.org, Jaroslav Kysela , Takashi Iwai From: SF Markus Elfring Message-ID: Date: Sat, 18 Nov 2017 22:15:57 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Language: en-GB X-Provags-ID: V03:K0:0QMLiA2hBA7TgaK+7/NJFOkl/o4CK18KTUm7ym+2cPWCGXXDp86 5ZLYuKzA2vq7h2uYdgs2vtCXdncDkZ/o6aDUkajQrYQHMgOawRUbxu8Nr9wBDbuVdM+KBY/ p1wHO9Nzd9BpoOIjIe23NsJcNSeaxXSz9E4XFm1kUF9lXTtlIUIsohlsAr2x2D0YQdX6r/v dM/PonayfwHFLwSs+mIiQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:dE7J1kRiwfY=:+4wcCC2siuNYocuQfWl2pv 2xJ1rqHLXKUG8MFWl0SurZ/f3OV4JlOXkPZDKJl2JP2YQKD5hNjOxDdDUe1lHN6w1ej72gRP9 W6y97IEc/1Ha08DoIMf03Eih+gtPls8UgfqkE7IWRnG8hY/6kSnT2hHhaFcalXFLeuE/oFuE3 cSAO7nn/HUThfaUSH+ZgyuQBbXHoBoyNfrgLWC+XxhlkxWdiYmAl8uV2dR7o/OlJbt+IiIn9L AHjBqwa6pYCasXz8zZxWHhJ6uQFZ3klbrdJSrBl1fwdxXT5N+7woKnWeNOiU1TJV2SHL+3mqA QvpItotYG1cZQ0vcpEsc7Y/7twrqHrAvwVEsMQbxWzIIxXf/UgdHTlnmFh9UAtWGMdHEQxeHX q4wCxfUBVgZnvB82K7uoW90QB2f8wOC1A/2QckmjIONJG2j6Z3YH3vxcZt2O0encBN5cKQIDZ 2nSfIEmTScNQ9P7xWmfrVBRgo4gtSfXaEaOdhTP1cJc+M2irDNSckTAcI3zbG4cPdSoymYbBf 9JpI4mNGOsOu4s7GwyNqTq3ZE/Wm/ZkSlkLU2GdzS7qC+ext/CUmqNlCt9TylA7ISdCP1UkbA W+H/k011qkKPL/J2/tyvc5eA7C7zvz0Awe/Ipe2KjNySllp2BcxFPu2NQ4R96mc/j7RPmvm2Y 9yAEGBDEw9MylFkBhSUQigmFCOB/ds2olMjMIPtTNhWMD5CZqSSY1zaGB6cVud56X0Zj14Ej1 cB2BZi1pt+mCnA41mxUfZetiZzKPVRA5kexEMI7MRPov/m5CZMoixLSSRxQZwvzYgVOiaaE1N /xhk8txA1P9A4IrnhxPAefu8vr0/pa8F401DL31yCxbYNoucM8= Cc: kernel-janitors@vger.kernel.org, LKML Subject: [alsa-devel] [PATCH] ALSA: cs5530: Use common error handling code in snd_cs5530_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: Sat, 18 Nov 2017 22:10:19 +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/pci/cs5530.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sound/pci/cs5530.c b/sound/pci/cs5530.c index 0a8cf94c4858..674572edf2d2 100644 --- a/sound/pci/cs5530.c +++ b/sound/pci/cs5530.c @@ -269,23 +269,24 @@ static int snd_cs5530_probe(struct pci_dev *pci, return err; err = snd_cs5530_create(card, pci, &chip); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; strcpy(card->driver, "CS5530"); strcpy(card->shortname, "CS5530 Audio"); sprintf(card->longname, "%s at 0x%lx", card->shortname, chip->pci_base); 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); dev++; return 0; + +free_card: + snd_card_free(card); + return err; } static struct pci_driver cs5530_driver = {