From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932693AbdHVMLr (ORCPT ); Tue, 22 Aug 2017 08:11:47 -0400 Received: from mout.web.de ([212.227.15.3]:63172 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932427AbdHVMLq (ORCPT ); Tue, 22 Aug 2017 08:11:46 -0400 To: alsa-devel@alsa-project.org, Jaroslav Kysela , Takashi Iwai From: SF Markus Elfring Subject: [PATCH] ALSA: pcsp: Use common error handling code in snd_card_pcsp_probe() Cc: LKML , kernel-janitors@vger.kernel.org Message-ID: <08ee0d6b-788b-2845-6964-e1e55c2d2292@users.sourceforge.net> Date: Tue, 22 Aug 2017 14:10:30 +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:O5XSvfUv6lBV6FmeIq/TZLL7uIA60w/h6skAE8Ndl3F7p0ffSCb pHVMMG3D+npq6XP9xXJWpBvYjlRcanVbGyFE8w9ierW0Jml/tNhyVDHZQvzYOLTu17Z9X0e YvGPUBmhIwucaFh/UGT8W23HQhuOj09LhUqIRecpWCeIvrvgYEiriOXRx1HNKhWMtxXPYVs +VMY2cfFd3fO9PYH48g2w== X-UI-Out-Filterresults: notjunk:1;V01:K0:XDm37h1YbI0=:5uSakJx2q4qJSiOC2xuor6 32BPBxHd16HBr96jclruDevGbcxHdz6g3cLvwhRHLxVikyAVlpIJW7QOl2aiDRxj+BMwyA3eZ CBi09N1m0pPnIVxXujd8f3CEhkcdFTwWoUiGOJA2ttiU44mBpQQ2rBSdjdQKFI024p1vWm6Ng CquPcLryGDwcu4Ty/CHqs/xpifJNufSEYSwIsknePEtHfJodvAFfuEV/N4hys6wqsXmkD3YN3 dVbBDtvceFvQK1ZTy+qUyLhUqnoHdDmaoR8sk/IZzr0sQEoKnXYofKk73XdNMd/V6hCxZAXKH WV1Ks2bF6sGGJw0zlcUSEyGUj/ofni+SwKAz/y2OrdcGMWtqeR8pCvhD/Ockehbo0Yu8RTPsi 83MoEW7YlW+uei0/5b9FMgcYgbF8nC6N4EiXjk39fXrKUDZt0EgWKv4fX7i3SluwP0NYyh97d 5juqdDGtGWRrvmbJztDSnYeQ7acowWPrbSGozVEoCNEMAljhhFUdKACnqVfQftGD5Lf2a0pa0 Vocq1AtlWmdB5X97xZYEEkc6bnxfNhoG46IZfTGS83H9bLSMmi0NvwkfmmBKu6A1I2k3QUksm H5K6CKo++wG6zW52RSCqbCGuicop2oR7wkAiJfysMM1fTbqE8hGR94rG20osLx8zInhK8Gb7B ZmmuqZAdUBHXWcUAlrNlLP2l2QLuVrdLPL5cM8rd9+ABFRk0Jvx2UC6oQT4itFopxe+S61t2g heOc6qljNnKWoMEKsEJLoPZUK7KiTskUu3WpF5mpVBmcy7QpGR7vvy7YkfA4EQDl/6LRoPJnH Y76rAh69DR0G1aH6UoIk4wKvIG3qsUuZZiPgvpu10Zbq0hGchg0MeszMTmc+Uy2gP+aJSs/ Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 22 Aug 2017 14:00:21 +0200 Add a jump target so that a bit of exception handling can be better reused in this function. Signed-off-by: Markus Elfring --- sound/drivers/pcsp/pcsp.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/sound/drivers/pcsp/pcsp.c b/sound/drivers/pcsp/pcsp.c index 72e2d0012084..c8ea4fed3905 100644 --- a/sound/drivers/pcsp/pcsp.c +++ b/sound/drivers/pcsp/pcsp.c @@ -108,22 +108,17 @@ static int snd_card_pcsp_probe(int devnum, struct device *dev) return err; err = snd_pcsp_create(card); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err) + goto free_card; + if (!nopcm) { err = snd_pcsp_new_pcm(&pcsp_chip); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err) + goto free_card; } err = snd_pcsp_new_mixer(&pcsp_chip, nopcm); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err) + goto free_card; strcpy(card->driver, "PC-Speaker"); strcpy(card->shortname, "pcsp"); @@ -131,7 +126,8 @@ static int snd_card_pcsp_probe(int devnum, struct device *dev) pcsp_chip.port); err = snd_card_register(card); - if (err < 0) { + if (err) { +free_card: snd_card_free(card); return err; } -- 2.14.0