ALSA: usb-audio: Handle the error from snd_usb_mixer_apply_create_quirk()

commit 328e9f6973be2ee67862cb17bf6c0c5c5918cd72 upstream.

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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 538df481fe5e95e75c2ded8c04323f11159ed7d1..e08a859ee9978cb645b2a289347b6e3dabe51de6 100644 (file)
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -2499,7 +2499,9 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif,
            (err = snd_usb_mixer_status_create(mixer)) < 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)