Skip to content

Commit

Permalink
ALSA: sonicvibes: add error handling for snd_ctl_add
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
ZhouyangJia authored and tiwai committed Jun 14, 2018
1 parent d9d5ed1 commit 41538f2
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions sound/pci/sonicvibes.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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;
}
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 41538f2

Please sign in to comment.