ALSA: sonicvibes: add error handling for snd_ctl_add
authorZhouyang Jia <jiazhouyang09@gmail.com>
Thu, 14 Jun 2018 11:41:37 +0000 (19:41 +0800)
committerTakashi Iwai <tiwai@suse.de>
Thu, 14 Jun 2018 16:00:30 +0000 (18:00 +0200)
When snd_ctl_add fails, the lack of error-handling code may
cause unexpected results.

This patch adds error-handling code after calling snd_ctl_add.

Signed-off-by: Zhouyang Jia <jiazhouyang09@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/sonicvibes.c

index a8abb15e3c3ab0d3bce8b7c984d15d826b8699bd..7fbdb703bfcd58ef5df9401a3c6c6ab4a0d8d454 100644 (file)
@@ -1188,6 +1188,7 @@ SONICVIBES_SINGLE("Joystick Speed", 0, SV_IREG_GAME_PORT, 1, 15, 0);
 static int snd_sonicvibes_create_gameport(struct sonicvibes *sonic)
 {
        struct gameport *gp;
+       int err;
 
        sonic->gameport = gp = gameport_allocate_port();
        if (!gp) {
@@ -1203,7 +1204,10 @@ static int snd_sonicvibes_create_gameport(struct sonicvibes *sonic)
 
        gameport_register_port(gp);
 
-       snd_ctl_add(sonic->card, snd_ctl_new1(&snd_sonicvibes_game_control, sonic));
+       err = snd_ctl_add(sonic->card,
+               snd_ctl_new1(&snd_sonicvibes_game_control, sonic));
+       if (err < 0)
+               return err;
 
        return 0;
 }
@@ -1515,7 +1519,11 @@ static int snd_sonic_probe(struct pci_dev *pci,
                return err;
        }
 
-       snd_sonicvibes_create_gameport(sonic);
+       err = snd_sonicvibes_create_gameport(sonic);
+       if (err < 0) {
+               snd_card_free(card);
+               return err;
+       }
 
        if ((err = snd_card_register(card)) < 0) {
                snd_card_free(card);