[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <f390776b-343f-3787-8520-0754ddfe8154@users.sourceforge.net>
Date: Wed, 23 Aug 2017 10:27:14 +0200
From: SF Markus Elfring <elfring@...rs.sourceforge.net>
To: alsa-devel@...a-project.org, Arnd Bergmann <arnd@...db.de>,
Arvind Yadav <arvind.yadav.cs@...il.com>,
Dan Carpenter <dan.carpenter@...cle.com>,
Ingo Molnar <mingo@...nel.org>,
Jaroslav Kysela <perex@...ex.cz>, Takashi Iwai <tiwai@...e.de>,
Takashi Sakamoto <o-takashi@...amocchi.jp>,
Vegard Nossum <vegard.nossum@...cle.com>
Cc: kernel-janitors@...r.kernel.org,
LKML <linux-kernel@...r.kernel.org>
Subject: [PATCH 4/6] ALSA: timer: Use common error handling code in
alsa_timer_init()
From: Markus Elfring <elfring@...rs.sourceforge.net>
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 <elfring@...rs.sourceforge.net>
---
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
Powered by blists - more mailing lists