From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753664AbdHWI2F (ORCPT ); Wed, 23 Aug 2017 04:28:05 -0400 Received: from mout.web.de ([212.227.15.3]:60825 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753495AbdHWI2C (ORCPT ); Wed, 23 Aug 2017 04:28:02 -0400 Subject: [PATCH 4/6] ALSA: timer: Use common error handling code in alsa_timer_init() From: SF Markus Elfring To: alsa-devel@alsa-project.org, Arnd Bergmann , Arvind Yadav , Dan Carpenter , Ingo Molnar , Jaroslav Kysela , Takashi Iwai , Takashi Sakamoto , Vegard Nossum Cc: kernel-janitors@vger.kernel.org, LKML References: <800d7aa6-d8f2-cbf5-caaa-7e4006976e68@users.sourceforge.net> Message-ID: Date: Wed, 23 Aug 2017 10:27:14 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <800d7aa6-d8f2-cbf5-caaa-7e4006976e68@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:LlHuiPJFt7qKjU06zgmDSntBUeAXS0D0jUlOPBFgJ3F/WaZ9ma8 oS3vs/mDCz7W0F4dTQkExmo8lP7uFDHb2X69fKuAv0AXf4j1c6I0dc0mMI0vvU50aIov/rs qGSyd0MyQdTzJf70kJ/rckaBGlU/2x/rgMjbR8gGi4LL4OlxCg1r2f8Asvu6/S2k4YGa1T9 nkbl/E/kYvd1xeE6koXzQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:dbtAfTJF9ik=:FRAj6WVaqy1VqWCjVd6etG tTPejK7C39DXxoGFEvQDcG89NHWBI68laoPII92z+smtx1WvjqGRUiWnxvMQWznVEWtA3WqyH dT1Y9QHmBzVJ9YrMspYu4FtH/kLNdyvuA0r34J/r4COG54/Ad9+qltPvICQ8NNJgllTueXIJ/ 9k4pVhtAA+0WtrnCHs9Fs4ZxtFC/SF+ksQLYbgxIrPux0jnE7PnU2G/rNCH31eZYyH4zWKh2z 74urXtGMoPjJjXMogzVjmHWygZyS1uVj/1BaI/UYyOYGekVcvY+mbCj60BiZzhjMeMnCURQ9v htCvGeF8oZ6RWO0YIG+LbQ8gPMO9/UGDL1vZyqZb8jlb0qm59AtpXVyBVCPDSYiUlua/g+gWt chi5GitTLsMadANxecVbs/LjBUQ7FdVCBczpHKNznk3+zXX2n2Py26T+2WZzWXmU9XXi82Lh1 WK05tJba9WZ8s0HE/l0FgRjq9gpvO8qH5meFu8rLSnl0m3Dykp74jMcNp9wSpzQZHfcTdtK9t n0bkbDtg4icNKLlqlcnI1ASbkyIkgaR6w5bB1FqpHXnQkD2N1DToJbnjFwUeEbIAher7QU9o1 Gqc6+SGpJMWoyooFtCCHhLuvsZFr5fpNIn5ZS3zn+PPBqTSEzCkC9gAGz8Tp0ttG+7Y0Xk1lP SGaO3RdHUIB2m2dUN2m77TEeq5BGDI7ZDcLqS/HC5AFKyxqFE59axzIaKcLdhJ1deUerM/JBR FSdQjiVRTVH9twFVsM+ws9dnx1uCd6XmyP+geVS0l5BQOEaO1vw50st5xgUf3gDz/vXg/03BW prEcZLOMa3s0vQMXnwePWDaiFhkKITvwIiLlZr7b/41RT+ZrEY= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 23 Aug 2017 09:30:41 +0200 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/timer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/core/timer.c b/sound/core/timer.c index a9b9a277e00c..6d73a63f6e2b 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -2096,8 +2096,7 @@ static int __init alsa_timer_init(void) err = snd_timer_register_system(); if (err < 0) { pr_err("ALSA: unable to register system timer (%i)\n", err); - put_device(&timer_dev); - return err; + goto put_timer; } err = snd_register_device(SNDRV_DEVICE_TYPE_TIMER, NULL, 0, @@ -2105,12 +2104,15 @@ static int __init alsa_timer_init(void) if (err < 0) { pr_err("ALSA: unable to register timer device (%i)\n", err); snd_timer_free_all(); - put_device(&timer_dev); - return err; + goto put_timer; } snd_timer_proc_init(); return 0; + +put_timer: + put_device(&timer_dev); + return err; } static void __exit alsa_timer_exit(void) -- 2.14.0