ALSA: timer: Use common error handling code in alsa_timer_init()
authorMarkus Elfring <elfring@users.sourceforge.net>
Wed, 23 Aug 2017 07:30:41 +0000 (09:30 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 23 Aug 2017 08:39:09 +0000 (10:39 +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@users.sourceforge.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/core/timer.c

index 6051aed3197f02a1b2a5bc0bb3375bef08e0d47a..6cdd04a459626c86f185742d099ab16729b7d517 100644 (file)
@@ -2097,8 +2097,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,
@@ -2106,12 +2105,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)