Skip to content

Commit

Permalink
ALSA: usb-audio: Handle the error from snd_usb_mixer_apply_create_qui…
Browse files Browse the repository at this point in the history
…rk()

The error from snd_usb_mixer_apply_create_quirk() is ignored in the
current usb-audio driver code, which will continue the probing even
after the error.  Let's take it more serious.

Fixes: 7b1eda2 ("ALSA: usb-mixer: factor out quirks")
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai committed Apr 24, 2019
1 parent 442e321 commit 328e9f6
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion sound/usb/mixer.c
Original file line number Diff line number Diff line change
Expand Up @@ -3490,7 +3490,9 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif,
if (err < 0)
goto _error;

snd_usb_mixer_apply_create_quirk(mixer);
err = snd_usb_mixer_apply_create_quirk(mixer);
if (err < 0)
goto _error;

err = snd_device_new(chip->card, SNDRV_DEV_CODEC, mixer, &dev_ops);
if (err < 0)
Expand Down

0 comments on commit 328e9f6

Please sign in to comment.