From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753675AbdKKLND (ORCPT ); Sat, 11 Nov 2017 06:13:03 -0500 Received: from mout.web.de ([212.227.15.3]:63496 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751418AbdKKLNB (ORCPT ); Sat, 11 Nov 2017 06:13:01 -0500 Subject: [PATCH 2/3] ALSA: rawmidi: Use common error handling code in snd_rawmidi_new() From: SF Markus Elfring To: alsa-devel@alsa-project.org, Fabian Frederick , Ingo Molnar , Jaroslav Kysela , Takashi Iwai , Takashi Sakamoto Cc: LKML , kernel-janitors@vger.kernel.org References: Message-ID: <4f75ca87-05bb-d32c-0691-4b7d7a8ad3da@users.sourceforge.net> Date: Sat, 11 Nov 2017 12:12:13 +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:+zhH/Hrm4udZgpK1hOUnx9cZRJRZP2EZ0wpFsYoyenzSUyB3SZw Xyaf0EJ66WWVRLuwBGM9kZXikizGsT91DRn4qaH5Vji4qmAZxJuPiVV0vMCEINKJfaNZYyC sl3bW931ZQo3fA/4GL+puPcBmytxgo6+FAwsCDIcZlFVkJx4n+9dm1jJTzVv8HhLLnRzU7x xKOXNbzi8VRSTKUjAaFkw== X-UI-Out-Filterresults: notjunk:1;V01:K0:s1+sUBgdcLk=:Lxt6f59j04KQFBy/Yrb6dH 1xdX7LOi9Pt3R03t8EbdXXPH1xU/uHY3yENBec6TNcmbsIbVlx1apIYsNyGDJfI2Pz6RNEm/9 q42DmvsZrxQO0a1gSeuzuCbY25cUeGvaFiFlX629zCR1V3DOokP7fUGV89rUdo+NNo/RNog1h zJUw/32BnMcayrh5DxXyXzJgWcDPy7/QsXZu5+FQyCvIuZ74OHK3pUUlbeCzRbWaq1/w48ptN mnr58o/AfEm8IMFoK1gyTOnphNZCM71OrEUuNMw9rbX8+ajtLG2siKMzgjKg6t39v+OvCUcx5 AWpfgvQ1wX3uutsDqHssNLhLIEbf11V2hMqyFRO60A7tGMG5kPapaneELAfsp9eanqGwGemEj Hoa3uiQ9nTbxC/1yuz8ysLi5MDDCSEnmA908LKKmhfcgJBqa/6H+lzMS0WaCYFOVA7lgywnWI paHYR4ITnPJsyYe46wrAFJokAyniQgXm5+rgSpnNtH7KjW87fiN2TvdaiUpEbTF8dMeI+MZ0N IcvPXhBPdr22y/hHpFWeBfxHGQL5KfAwsH46QHt+LxhB6uM3eD7rg2y1GTXdKt63Yu8DD2Rut zOpMFWXH/JB07XztSrSpbVbtjL87Zq6fMVkZjsxHZTB60iSY9QLi6+3kuGyWEycM9BpXokOu9 bUupLH8e1RxVs0j1SM+0LdiFZrtEutOXYg5CEbzBEPK9E+tT7JpD74Gm2GL67WGZ5LF6G/9UD ysDUXvFpxiQrIna33QkkZ7RSdKGnNwyrO4I+ESOx599nSZqoYYddACuaHaX2zzrd+zA0Jhhqr KiYxPEDot5gB2xIcCvOnP+q3gseoSP4l8aV2+TDEReyqqvYpBg= 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 11:36:25 +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/core/rawmidi.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c index c17f173150e9..34686000ecce 100644 --- a/sound/core/rawmidi.c +++ b/sound/core/rawmidi.c @@ -1560,10 +1560,8 @@ int snd_rawmidi_new(struct snd_card *card, char *id, int device, ->streams[SNDRV_RAWMIDI_STREAM_INPUT], SNDRV_RAWMIDI_STREAM_INPUT, input_count); - if (err < 0) { - snd_rawmidi_free(rmidi); - return err; - } + if (err < 0) + goto free_midi; err = snd_rawmidi_alloc_substreams(rmidi, @@ -1571,19 +1569,20 @@ int snd_rawmidi_new(struct snd_card *card, char *id, int device, ->streams[SNDRV_RAWMIDI_STREAM_OUTPUT], SNDRV_RAWMIDI_STREAM_OUTPUT, output_count); - if (err < 0) { - snd_rawmidi_free(rmidi); - return err; - } + if (err < 0) + goto free_midi; err = snd_device_new(card, SNDRV_DEV_RAWMIDI, rmidi, &ops); - if (err < 0) { - snd_rawmidi_free(rmidi); - return err; - } + if (err < 0) + goto free_midi; + if (rrawmidi) *rrawmidi = rmidi; return 0; + +free_midi: + snd_rawmidi_free(rmidi); + return err; } EXPORT_SYMBOL(snd_rawmidi_new); -- 2.15.0