summaryrefslogtreecommitdiff
path: root/sound/usb
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-04-24 13:00:03 +0200
committerTakashi Iwai <tiwai@suse.de>2019-04-24 13:00:03 +0200
commit328e9f6973be2ee67862cb17bf6c0c5c5918cd72 (patch)
tree12901e3a1e6ec5cd36b93128edb60e43d9ed3e96 /sound/usb
parent442e321ed223d9c01a444c6f874e32fb283c17d2 (diff)
ALSA: usb-audio: Handle the error from snd_usb_mixer_apply_create_quirk()
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: 7b1eda223deb ("ALSA: usb-mixer: factor out quirks") Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/mixer.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 73d7dff425c1..c095d9751924 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -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)